diff --git a/java/google/registry/backup/BackupModule.java b/java/google/registry/backup/BackupModule.java index 16a983c0e..fbbe605fd 100644 --- a/java/google/registry/backup/BackupModule.java +++ b/java/google/registry/backup/BackupModule.java @@ -25,20 +25,15 @@ import static java.util.concurrent.Executors.newFixedThreadPool; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListeningExecutorService; - import dagger.Module; import dagger.Provides; - import google.registry.cron.CommitLogFanoutAction; import google.registry.request.HttpException.BadRequestException; import google.registry.request.Parameter; - -import org.joda.time.DateTime; - import java.lang.annotation.Documented; - import javax.inject.Qualifier; import javax.servlet.http.HttpServletRequest; +import org.joda.time.DateTime; /** * Dagger module for backup package. diff --git a/java/google/registry/backup/BackupUtils.java b/java/google/registry/backup/BackupUtils.java index e81ad47d3..9282abe89 100644 --- a/java/google/registry/backup/BackupUtils.java +++ b/java/google/registry/backup/BackupUtils.java @@ -20,9 +20,7 @@ import com.google.appengine.api.datastore.EntityTranslator; import com.google.common.collect.AbstractIterator; import com.google.common.collect.ImmutableList; import com.google.storage.onestore.v3.OnestoreEntity.EntityProto; - import google.registry.model.ImmutableObject; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/java/google/registry/backup/CommitLogCheckpointAction.java b/java/google/registry/backup/CommitLogCheckpointAction.java index 97bbc39ff..a744e1803 100644 --- a/java/google/registry/backup/CommitLogCheckpointAction.java +++ b/java/google/registry/backup/CommitLogCheckpointAction.java @@ -23,17 +23,14 @@ import static google.registry.util.DateTimeUtils.isBeforeOrAt; import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import com.googlecode.objectify.VoidWork; - import google.registry.model.ofy.CommitLogCheckpoint; import google.registry.model.ofy.CommitLogCheckpointRoot; import google.registry.request.Action; import google.registry.util.Clock; import google.registry.util.FormattingLogger; import google.registry.util.TaskEnqueuer; - -import org.joda.time.DateTime; - import javax.inject.Inject; +import org.joda.time.DateTime; /** * Action that saves commit log checkpoints to datastore and kicks off a diff export task. diff --git a/java/google/registry/backup/CommitLogCheckpointStrategy.java b/java/google/registry/backup/CommitLogCheckpointStrategy.java index bfe765c82..66afa784a 100644 --- a/java/google/registry/backup/CommitLogCheckpointStrategy.java +++ b/java/google/registry/backup/CommitLogCheckpointStrategy.java @@ -23,22 +23,17 @@ import static google.registry.util.DateTimeUtils.earliestOf; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Work; - import google.registry.model.ofy.CommitLogBucket; import google.registry.model.ofy.CommitLogCheckpoint; import google.registry.model.ofy.CommitLogManifest; import google.registry.model.ofy.Ofy; import google.registry.util.Clock; - -import org.joda.time.DateTime; - import java.util.List; import java.util.Map.Entry; - import javax.inject.Inject; +import org.joda.time.DateTime; /** * Implementation of the procedure for determining point-in-time consistent commit log checkpoint. diff --git a/java/google/registry/backup/DeleteOldCommitLogsAction.java b/java/google/registry/backup/DeleteOldCommitLogsAction.java index bb587c3b3..c45995e21 100644 --- a/java/google/registry/backup/DeleteOldCommitLogsAction.java +++ b/java/google/registry/backup/DeleteOldCommitLogsAction.java @@ -21,12 +21,10 @@ import static google.registry.model.ofy.CommitLogBucket.getBucketKey; import static google.registry.request.Action.Method.POST; import com.google.common.base.Function; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Work; import com.googlecode.objectify.cmd.Loader; import com.googlecode.objectify.cmd.Query; - import google.registry.config.ConfigModule.Config; import google.registry.model.ofy.CommitLogBucket; import google.registry.model.ofy.CommitLogManifest; @@ -36,14 +34,11 @@ import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.util.Clock; import google.registry.util.FormattingLogger; - +import java.util.List; +import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; -import java.util.List; - -import javax.inject.Inject; - /** * Task that garbage collects old {@link CommitLogManifest} entities. * diff --git a/java/google/registry/backup/ExportCommitLogDiffAction.java b/java/google/registry/backup/ExportCommitLogDiffAction.java index 426b2000a..766ec067f 100644 --- a/java/google/registry/backup/ExportCommitLogDiffAction.java +++ b/java/google/registry/backup/ExportCommitLogDiffAction.java @@ -38,9 +38,7 @@ import com.google.common.collect.ComparisonChain; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; - import google.registry.config.ConfigModule.Config; import google.registry.model.ImmutableObject; import google.registry.model.ofy.CommitLogBucket; @@ -50,18 +48,15 @@ import google.registry.model.ofy.CommitLogMutation; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.util.FormattingLogger; - -import org.joda.time.DateTime; - import java.io.IOException; import java.io.OutputStream; import java.util.Collection; import java.util.Comparator; import java.util.List; import java.util.Map; - import javax.annotation.Nullable; import javax.inject.Inject; +import org.joda.time.DateTime; /** Action that exports the diff between two commit log checkpoints to GCS. */ @Action( diff --git a/java/google/registry/backup/GcsDiffFileLister.java b/java/google/registry/backup/GcsDiffFileLister.java index ba713dc54..eb2e53095 100644 --- a/java/google/registry/backup/GcsDiffFileLister.java +++ b/java/google/registry/backup/GcsDiffFileLister.java @@ -30,21 +30,17 @@ import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; - import google.registry.backup.BackupModule.Backups; import google.registry.config.ConfigModule.Config; import google.registry.util.FormattingLogger; - -import org.joda.time.DateTime; - import java.io.IOException; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.concurrent.Callable; - import javax.inject.Inject; +import org.joda.time.DateTime; /** Utility class to list commit logs diff files stored on GCS. */ class GcsDiffFileLister { diff --git a/java/google/registry/backup/RestoreCommitLogsAction.java b/java/google/registry/backup/RestoreCommitLogsAction.java index dcd0185fe..a9912bc73 100644 --- a/java/google/registry/backup/RestoreCommitLogsAction.java +++ b/java/google/registry/backup/RestoreCommitLogsAction.java @@ -29,11 +29,9 @@ import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.Lists; import com.google.common.collect.PeekingIterator; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Result; import com.googlecode.objectify.util.ResultNow; - import google.registry.config.RegistryEnvironment; import google.registry.model.ImmutableObject; import google.registry.model.ofy.CommitLogBucket; @@ -45,9 +43,6 @@ import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.util.FormattingLogger; import google.registry.util.Retrier; - -import org.joda.time.DateTime; - import java.io.IOException; import java.io.InputStream; import java.nio.channels.Channels; @@ -57,8 +52,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.Callable; - import javax.inject.Inject; +import org.joda.time.DateTime; /** Restore Registry 2 commit logs from GCS to datastore. */ @Action( diff --git a/java/google/registry/bigquery/BigqueryConnection.java b/java/google/registry/bigquery/BigqueryConnection.java index ffbdaa817..e7814b032 100644 --- a/java/google/registry/bigquery/BigqueryConnection.java +++ b/java/google/registry/bigquery/BigqueryConnection.java @@ -56,7 +56,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; - import google.registry.bigquery.BigqueryUtils.DestinationFormat; import google.registry.bigquery.BigqueryUtils.SourceFormat; import google.registry.bigquery.BigqueryUtils.TableType; @@ -67,18 +66,15 @@ import google.registry.util.NonFinalForTesting; import google.registry.util.Sleeper; import google.registry.util.SqlTemplate; import google.registry.util.SystemSleeper; - -import org.joda.time.DateTime; -import org.joda.time.Duration; - import java.io.IOException; import java.util.Iterator; import java.util.List; import java.util.Random; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; - import javax.annotation.Nullable; +import org.joda.time.DateTime; +import org.joda.time.Duration; /** Class encapsulating parameters and state for accessing the Bigquery API. */ public class BigqueryConnection implements AutoCloseable { diff --git a/java/google/registry/bigquery/BigqueryFactory.java b/java/google/registry/bigquery/BigqueryFactory.java index f9ed0a5ba..fb35e5fbd 100644 --- a/java/google/registry/bigquery/BigqueryFactory.java +++ b/java/google/registry/bigquery/BigqueryFactory.java @@ -34,14 +34,11 @@ import com.google.api.services.bigquery.model.TableFieldSchema; import com.google.api.services.bigquery.model.TableReference; import com.google.api.services.bigquery.model.TableSchema; import com.google.common.collect.ImmutableList; - import google.registry.util.FormattingLogger; - import java.io.IOException; import java.util.List; import java.util.Map; import java.util.Set; - import javax.inject.Inject; /** Factory for creating {@link Bigquery} connections. */ diff --git a/java/google/registry/bigquery/BigqueryJobFailureException.java b/java/google/registry/bigquery/BigqueryJobFailureException.java index 0984b36a6..26ee3ace8 100644 --- a/java/google/registry/bigquery/BigqueryJobFailureException.java +++ b/java/google/registry/bigquery/BigqueryJobFailureException.java @@ -21,9 +21,7 @@ import com.google.api.client.googleapis.json.GoogleJsonResponseException; import com.google.api.services.bigquery.model.ErrorProto; import com.google.api.services.bigquery.model.JobStatus; import com.google.common.collect.Iterables; - import java.io.IOException; - import javax.annotation.Nullable; /** Generic exception to throw if a Bigquery job fails. */ diff --git a/java/google/registry/bigquery/BigqueryModule.java b/java/google/registry/bigquery/BigqueryModule.java index 74a005e14..f775d09d2 100644 --- a/java/google/registry/bigquery/BigqueryModule.java +++ b/java/google/registry/bigquery/BigqueryModule.java @@ -21,15 +21,12 @@ import com.google.api.services.bigquery.Bigquery; import com.google.api.services.bigquery.BigqueryScopes; import com.google.api.services.bigquery.model.TableFieldSchema; import com.google.common.collect.ImmutableList; - import dagger.Module; import dagger.Provides; import dagger.multibindings.ElementsIntoSet; import dagger.multibindings.Multibinds; - import google.registry.config.ConfigModule.Config; import google.registry.request.OAuthScopes; - import java.util.Map; import java.util.Set; diff --git a/java/google/registry/bigquery/BigqueryUtils.java b/java/google/registry/bigquery/BigqueryUtils.java index aeb625a24..30f5ce078 100644 --- a/java/google/registry/bigquery/BigqueryUtils.java +++ b/java/google/registry/bigquery/BigqueryUtils.java @@ -15,15 +15,13 @@ package google.registry.bigquery; import com.google.api.services.bigquery.model.JobReference; - +import java.util.concurrent.TimeUnit; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.DateTimeFormatterBuilder; import org.joda.time.format.DateTimeParser; import org.joda.time.format.ISODateTimeFormat; -import java.util.concurrent.TimeUnit; - /** Utilities related to Bigquery. */ public class BigqueryUtils { diff --git a/java/google/registry/billing/ExpandRecurringBillingEventsAction.java b/java/google/registry/billing/ExpandRecurringBillingEventsAction.java index 0fc7b1ede..78dcd8c0e 100644 --- a/java/google/registry/billing/ExpandRecurringBillingEventsAction.java +++ b/java/google/registry/billing/ExpandRecurringBillingEventsAction.java @@ -38,11 +38,9 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Range; - import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.Work; - import google.registry.mapreduce.MapreduceRunner; import google.registry.mapreduce.inputs.NullInput; import google.registry.model.billing.BillingEvent; @@ -57,14 +55,11 @@ import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.util.Clock; import google.registry.util.FormattingLogger; - +import java.util.Set; +import javax.inject.Inject; import org.joda.money.Money; import org.joda.time.DateTime; -import java.util.Set; - -import javax.inject.Inject; - /** * A mapreduce that expands {@link Recurring} billing events into synthetic {@link OneTime} events. * diff --git a/java/google/registry/braintree/BraintreeModule.java b/java/google/registry/braintree/BraintreeModule.java index d0bd47061..b5953100c 100644 --- a/java/google/registry/braintree/BraintreeModule.java +++ b/java/google/registry/braintree/BraintreeModule.java @@ -15,14 +15,11 @@ package google.registry.braintree; import com.braintreegateway.BraintreeGateway; - import dagger.Module; import dagger.Provides; - import google.registry.config.ConfigModule.Config; import google.registry.config.RegistryEnvironment; import google.registry.keyring.api.KeyModule.Key; - import javax.inject.Singleton; /** Dagger module for Braintree Payments API. */ diff --git a/java/google/registry/braintree/BraintreeRegistrarSyncer.java b/java/google/registry/braintree/BraintreeRegistrarSyncer.java index fe1fa5f90..80d73a92d 100644 --- a/java/google/registry/braintree/BraintreeRegistrarSyncer.java +++ b/java/google/registry/braintree/BraintreeRegistrarSyncer.java @@ -17,18 +17,15 @@ package google.registry.braintree; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Verify.verify; -import com.google.common.base.Optional; -import com.google.common.base.VerifyException; - import com.braintreegateway.BraintreeGateway; import com.braintreegateway.Customer; import com.braintreegateway.CustomerRequest; import com.braintreegateway.Result; import com.braintreegateway.exceptions.NotFoundException; - +import com.google.common.base.Optional; +import com.google.common.base.VerifyException; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; - import javax.inject.Inject; /** Helper for creating Braintree customer entries for registrars. */ diff --git a/java/google/registry/config/ConfigModule.java b/java/google/registry/config/ConfigModule.java index d92c99aad..b5cd8c4f7 100644 --- a/java/google/registry/config/ConfigModule.java +++ b/java/google/registry/config/ConfigModule.java @@ -18,19 +18,15 @@ import static google.registry.config.ConfigUtils.makeUrl; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; - import dagger.Module; import dagger.Provides; - -import org.joda.money.CurrencyUnit; -import org.joda.time.DateTimeConstants; -import org.joda.time.Duration; - import java.lang.annotation.Documented; import java.net.URI; import java.net.URL; - import javax.inject.Qualifier; +import org.joda.money.CurrencyUnit; +import org.joda.time.DateTimeConstants; +import org.joda.time.Duration; /** Dagger module for injecting configuration settings. */ @Module diff --git a/java/google/registry/config/RegistryConfig.java b/java/google/registry/config/RegistryConfig.java index 98e1d45d3..6c4dca20d 100644 --- a/java/google/registry/config/RegistryConfig.java +++ b/java/google/registry/config/RegistryConfig.java @@ -17,10 +17,8 @@ package google.registry.config; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.net.HostAndPort; - -import org.joda.time.Duration; - import java.net.URL; +import org.joda.time.Duration; /** * Domain Registry configuration. diff --git a/java/google/registry/config/RegistryEnvironment.java b/java/google/registry/config/RegistryEnvironment.java index ad58b7aa1..0c194ca73 100644 --- a/java/google/registry/config/RegistryEnvironment.java +++ b/java/google/registry/config/RegistryEnvironment.java @@ -15,7 +15,6 @@ package google.registry.config; import com.google.common.annotations.VisibleForTesting; - import javax.annotation.Nullable; /** Registry environments. */ diff --git a/java/google/registry/config/TestRegistryConfig.java b/java/google/registry/config/TestRegistryConfig.java index 2b4b9aadf..3ec49256b 100644 --- a/java/google/registry/config/TestRegistryConfig.java +++ b/java/google/registry/config/TestRegistryConfig.java @@ -20,10 +20,8 @@ import static org.joda.time.Duration.standardDays; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.net.HostAndPort; - -import org.joda.time.Duration; - import java.net.URL; +import org.joda.time.Duration; /** * An implementation of RegistryConfig for unit testing that contains suitable testing data. diff --git a/java/google/registry/cron/CommitLogFanoutAction.java b/java/google/registry/cron/CommitLogFanoutAction.java index e9742f214..d84ebaedd 100644 --- a/java/google/registry/cron/CommitLogFanoutAction.java +++ b/java/google/registry/cron/CommitLogFanoutAction.java @@ -20,14 +20,11 @@ import static java.util.concurrent.TimeUnit.SECONDS; import com.google.appengine.api.taskqueue.Queue; import com.google.appengine.api.taskqueue.TaskOptions; import com.google.common.base.Optional; - import google.registry.model.ofy.CommitLogBucket; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.util.TaskEnqueuer; - import java.util.Random; - import javax.inject.Inject; /** Action for fanning out cron tasks for each commit log bucket. */ diff --git a/java/google/registry/cron/CronModule.java b/java/google/registry/cron/CronModule.java index 1ee7d4440..f917c1172 100644 --- a/java/google/registry/cron/CronModule.java +++ b/java/google/registry/cron/CronModule.java @@ -21,12 +21,9 @@ import static google.registry.request.RequestParameters.extractSetOfParameters; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; - import dagger.Module; import dagger.Provides; - import google.registry.request.Parameter; - import javax.servlet.http.HttpServletRequest; /** Dagger module for the cron package. */ diff --git a/java/google/registry/cron/TldFanoutAction.java b/java/google/registry/cron/TldFanoutAction.java index b95076fad..485425625 100644 --- a/java/google/registry/cron/TldFanoutAction.java +++ b/java/google/registry/cron/TldFanoutAction.java @@ -34,16 +34,13 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; - import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.ParameterMap; import google.registry.request.RequestParameters; import google.registry.util.TaskEnqueuer; - import java.util.Random; import java.util.Set; - import javax.inject.Inject; /** diff --git a/java/google/registry/dns/DnsModule.java b/java/google/registry/dns/DnsModule.java index befc77d27..12ad4fa43 100644 --- a/java/google/registry/dns/DnsModule.java +++ b/java/google/registry/dns/DnsModule.java @@ -26,18 +26,14 @@ import static google.registry.request.RequestParameters.extractSetOfParameters; import com.google.appengine.api.taskqueue.Queue; import com.google.appengine.api.taskqueue.QueueFactory; - import dagger.Binds; import dagger.Module; import dagger.Provides; - import google.registry.dns.DnsConstants.TargetType; import google.registry.dns.writer.api.DnsWriterZone; import google.registry.request.Parameter; import google.registry.request.RequestParameters; - import java.util.Set; - import javax.inject.Named; import javax.servlet.http.HttpServletRequest; diff --git a/java/google/registry/dns/DnsQueue.java b/java/google/registry/dns/DnsQueue.java index 20131bfe6..b8144388d 100644 --- a/java/google/registry/dns/DnsQueue.java +++ b/java/google/registry/dns/DnsQueue.java @@ -35,20 +35,16 @@ import com.google.apphosting.api.DeadlineExceededException; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.net.InternetDomainName; - import google.registry.config.ConfigModule.Config; import google.registry.dns.DnsConstants.TargetType; import google.registry.model.registry.Registries; import google.registry.util.FormattingLogger; - -import org.joda.time.Duration; - import java.util.List; import java.util.concurrent.TimeUnit; - import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Named; +import org.joda.time.Duration; /** Methods for manipulating the queue used for DNS write tasks. */ public class DnsQueue { diff --git a/java/google/registry/dns/PublishDnsUpdatesAction.java b/java/google/registry/dns/PublishDnsUpdatesAction.java index a58179e1b..111c86543 100644 --- a/java/google/registry/dns/PublishDnsUpdatesAction.java +++ b/java/google/registry/dns/PublishDnsUpdatesAction.java @@ -19,7 +19,6 @@ import static google.registry.request.Action.Method.POST; import static google.registry.util.CollectionUtils.nullToEmpty; import com.google.common.net.InternetDomainName; - import google.registry.config.ConfigModule.Config; import google.registry.dns.writer.api.DnsWriter; import google.registry.request.Action; @@ -28,14 +27,11 @@ import google.registry.request.Parameter; import google.registry.request.RequestParameters; import google.registry.util.DomainNameUtils; import google.registry.util.FormattingLogger; - -import org.joda.time.Duration; - import java.util.Set; import java.util.concurrent.Callable; - import javax.inject.Inject; import javax.inject.Provider; +import org.joda.time.Duration; /** Task that sends domain and host updates to the DNS server. */ @Action(path = PublishDnsUpdatesAction.PATH, method = POST, automaticallyPrintOk = true) diff --git a/java/google/registry/dns/ReadDnsQueueAction.java b/java/google/registry/dns/ReadDnsQueueAction.java index 4f225755d..521f78b41 100644 --- a/java/google/registry/dns/ReadDnsQueueAction.java +++ b/java/google/registry/dns/ReadDnsQueueAction.java @@ -32,7 +32,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.TreeMultimap; - import google.registry.config.ConfigModule.Config; import google.registry.dns.DnsConstants.TargetType; import google.registry.model.registry.Registry; @@ -41,7 +40,6 @@ import google.registry.request.Parameter; import google.registry.request.RequestParameters; import google.registry.util.FormattingLogger; import google.registry.util.TaskEnqueuer; - import java.io.UnsupportedEncodingException; import java.util.Collection; import java.util.HashSet; @@ -49,7 +47,6 @@ import java.util.List; import java.util.Map; import java.util.Random; import java.util.Set; - import javax.inject.Inject; import javax.inject.Named; diff --git a/java/google/registry/dns/RefreshDnsAction.java b/java/google/registry/dns/RefreshDnsAction.java index e7f767e78..d8d55f5cb 100644 --- a/java/google/registry/dns/RefreshDnsAction.java +++ b/java/google/registry/dns/RefreshDnsAction.java @@ -25,7 +25,6 @@ import google.registry.request.HttpException.BadRequestException; import google.registry.request.HttpException.NotFoundException; import google.registry.request.Parameter; import google.registry.util.Clock; - import javax.inject.Inject; /** Action that manually triggers refresh of DNS information. */ diff --git a/java/google/registry/dns/WriteDnsAction.java b/java/google/registry/dns/WriteDnsAction.java index d908fa79a..926285752 100644 --- a/java/google/registry/dns/WriteDnsAction.java +++ b/java/google/registry/dns/WriteDnsAction.java @@ -24,7 +24,6 @@ import com.google.appengine.api.LifecycleManager; import com.google.appengine.api.taskqueue.TaskHandle; import com.google.common.base.Throwables; import com.google.common.net.InternetDomainName; - import google.registry.config.ConfigModule.Config; import google.registry.dns.DnsConstants.TargetType; import google.registry.dns.writer.api.DnsWriter; @@ -36,9 +35,6 @@ import google.registry.request.Parameter; import google.registry.request.RequestParameters; import google.registry.util.DomainNameUtils; import google.registry.util.FormattingLogger; - -import org.joda.time.Duration; - import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.HashMap; @@ -46,9 +42,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.concurrent.Callable; - import javax.inject.Inject; import javax.inject.Provider; +import org.joda.time.Duration; /** Action that consumes pull-queue for zone updates to write to the DNS server. */ @Action(path = "/_dr/task/writeDns", method = POST, automaticallyPrintOk = true) diff --git a/java/google/registry/dns/writer/api/DnsWriterZone.java b/java/google/registry/dns/writer/api/DnsWriterZone.java index 4df0cfb02..5949d22a0 100644 --- a/java/google/registry/dns/writer/api/DnsWriterZone.java +++ b/java/google/registry/dns/writer/api/DnsWriterZone.java @@ -15,7 +15,6 @@ package google.registry.dns.writer.api; import java.lang.annotation.Documented; - import javax.inject.Qualifier; /** Dagger qualifier for the fully-qualified zone name that's being updated. */ diff --git a/java/google/registry/dns/writer/api/VoidDnsWriter.java b/java/google/registry/dns/writer/api/VoidDnsWriter.java index a362098b5..2cc0788b6 100644 --- a/java/google/registry/dns/writer/api/VoidDnsWriter.java +++ b/java/google/registry/dns/writer/api/VoidDnsWriter.java @@ -15,7 +15,6 @@ package google.registry.dns.writer.api; import com.google.common.base.Joiner; - import java.util.HashSet; import java.util.Set; import java.util.logging.Logger; diff --git a/java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java b/java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java index b62a1b864..5ef1de7a2 100644 --- a/java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java +++ b/java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java @@ -19,13 +19,7 @@ import static com.google.common.base.Verify.verify; import com.google.common.annotations.VisibleForTesting; import com.google.common.primitives.Ints; - import google.registry.config.ConfigModule.Config; - -import org.joda.time.Duration; -import org.xbill.DNS.Message; -import org.xbill.DNS.Opcode; - import java.io.DataInputStream; import java.io.IOException; import java.io.InputStream; @@ -33,9 +27,11 @@ import java.io.OutputStream; import java.net.InetAddress; import java.net.Socket; import java.nio.ByteBuffer; - import javax.inject.Inject; import javax.net.SocketFactory; +import org.joda.time.Duration; +import org.xbill.DNS.Message; +import org.xbill.DNS.Opcode; /** * A transport for DNS messages. Sends/receives DNS messages over TCP using old-style {@link Socket} diff --git a/java/google/registry/dns/writer/dnsupdate/DnsUpdateConfigModule.java b/java/google/registry/dns/writer/dnsupdate/DnsUpdateConfigModule.java index b6c84e838..7bc868451 100644 --- a/java/google/registry/dns/writer/dnsupdate/DnsUpdateConfigModule.java +++ b/java/google/registry/dns/writer/dnsupdate/DnsUpdateConfigModule.java @@ -16,9 +16,7 @@ package google.registry.dns.writer.dnsupdate; import dagger.Module; import dagger.Provides; - import google.registry.config.ConfigModule.Config; - import org.joda.time.Duration; /** Dagger module that provides DNS configuration settings. */ diff --git a/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java b/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java index bc145fb90..5345c3109 100644 --- a/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java +++ b/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java @@ -18,7 +18,6 @@ import static com.google.common.base.Verify.verify; import static google.registry.model.EppResourceUtils.loadByUniqueId; import com.google.common.net.InternetDomainName; - import google.registry.config.ConfigModule.Config; import google.registry.dns.writer.api.DnsWriter; import google.registry.model.domain.DomainResource; @@ -26,7 +25,11 @@ import google.registry.model.domain.secdns.DelegationSignerData; import google.registry.model.host.HostResource; import google.registry.model.registry.Registries; import google.registry.util.Clock; - +import java.io.IOException; +import java.net.Inet4Address; +import java.net.Inet6Address; +import java.net.InetAddress; +import javax.inject.Inject; import org.joda.time.Duration; import org.xbill.DNS.AAAARecord; import org.xbill.DNS.ARecord; @@ -41,13 +44,6 @@ import org.xbill.DNS.TextParseException; import org.xbill.DNS.Type; import org.xbill.DNS.Update; -import java.io.IOException; -import java.net.Inet4Address; -import java.net.Inet6Address; -import java.net.InetAddress; - -import javax.inject.Inject; - /** * A DnsWriter that implements the DNS UPDATE protocol as specified in * RFC 2136. Publishes changes in the diff --git a/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java b/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java index 58005cb9a..66992f32c 100644 --- a/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java +++ b/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java @@ -17,9 +17,7 @@ package google.registry.dns.writer.dnsupdate; import dagger.Binds; import dagger.Module; import dagger.Provides; - import google.registry.dns.writer.api.DnsWriter; - import javax.net.SocketFactory; /** Dagger module that provides a DnsUpdateWriter. */ diff --git a/java/google/registry/export/BigqueryPollJobAction.java b/java/google/registry/export/BigqueryPollJobAction.java index 48df0dbe5..ad2a0ef9a 100644 --- a/java/google/registry/export/BigqueryPollJobAction.java +++ b/java/google/registry/export/BigqueryPollJobAction.java @@ -25,9 +25,7 @@ import com.google.appengine.api.taskqueue.Queue; import com.google.appengine.api.taskqueue.TaskHandle; import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TaskOptions.Method; - import dagger.Lazy; - import google.registry.request.Action; import google.registry.request.Header; import google.registry.request.HttpException.BadRequestException; @@ -35,16 +33,13 @@ import google.registry.request.HttpException.NotModifiedException; import google.registry.request.Payload; import google.registry.util.FormattingLogger; import google.registry.util.TaskEnqueuer; - -import org.joda.time.Duration; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; - import javax.inject.Inject; +import org.joda.time.Duration; /** * An action which polls the state of a bigquery job. If it is completed then it will log its diff --git a/java/google/registry/export/CheckSnapshotServlet.java b/java/google/registry/export/CheckSnapshotServlet.java index 321a7b46f..f61964142 100644 --- a/java/google/registry/export/CheckSnapshotServlet.java +++ b/java/google/registry/export/CheckSnapshotServlet.java @@ -35,22 +35,18 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.common.net.MediaType; - import google.registry.export.DatastoreBackupInfo.BackupStatus; import google.registry.request.HttpException.BadRequestException; import google.registry.util.FormattingLogger; import google.registry.util.NonFinalForTesting; - -import org.joda.time.Duration; -import org.joda.time.PeriodType; -import org.joda.time.format.PeriodFormat; - import java.io.IOException; import java.util.Set; - import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.joda.time.Duration; +import org.joda.time.PeriodType; +import org.joda.time.format.PeriodFormat; /** Check the status of a snapshot, and if complete, trigger loading it into BigQuery. */ public class CheckSnapshotServlet extends HttpServlet { diff --git a/java/google/registry/export/DatastoreBackupInfo.java b/java/google/registry/export/DatastoreBackupInfo.java index c32f0005f..312d4b220 100644 --- a/java/google/registry/export/DatastoreBackupInfo.java +++ b/java/google/registry/export/DatastoreBackupInfo.java @@ -24,16 +24,13 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; - import google.registry.util.Clock; import google.registry.util.NonFinalForTesting; import google.registry.util.SystemClock; - -import org.joda.time.DateTime; -import org.joda.time.Duration; - import java.util.Date; import java.util.List; +import org.joda.time.DateTime; +import org.joda.time.Duration; /** Container for information about a datastore backup. */ public class DatastoreBackupInfo { diff --git a/java/google/registry/export/DatastoreBackupService.java b/java/google/registry/export/DatastoreBackupService.java index d403d2a74..4282d8a2d 100644 --- a/java/google/registry/export/DatastoreBackupService.java +++ b/java/google/registry/export/DatastoreBackupService.java @@ -30,9 +30,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; - import google.registry.util.NonFinalForTesting; - import java.util.NoSuchElementException; /** An object providing methods for starting and querying datastore backups. */ diff --git a/java/google/registry/export/DriveModule.java b/java/google/registry/export/DriveModule.java index 14a7f1475..ab7cf2c77 100644 --- a/java/google/registry/export/DriveModule.java +++ b/java/google/registry/export/DriveModule.java @@ -19,14 +19,11 @@ import com.google.api.client.http.HttpTransport; import com.google.api.client.json.JsonFactory; import com.google.api.services.drive.Drive; import com.google.api.services.drive.DriveScopes; - import dagger.Module; import dagger.Provides; import dagger.multibindings.ElementsIntoSet; - import google.registry.config.ConfigModule.Config; import google.registry.request.OAuthScopes; - import java.util.Set; /** diff --git a/java/google/registry/export/ExportConstants.java b/java/google/registry/export/ExportConstants.java index 66a642704..2a0d66acb 100644 --- a/java/google/registry/export/ExportConstants.java +++ b/java/google/registry/export/ExportConstants.java @@ -22,7 +22,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Ordering; - import google.registry.model.EntityClasses; import google.registry.model.ImmutableObject; import google.registry.model.annotations.NotBackedUp; diff --git a/java/google/registry/export/ExportDomainListsAction.java b/java/google/registry/export/ExportDomainListsAction.java index 0617ec5d1..89830addb 100644 --- a/java/google/registry/export/ExportDomainListsAction.java +++ b/java/google/registry/export/ExportDomainListsAction.java @@ -29,7 +29,6 @@ import com.google.appengine.tools.mapreduce.Reducer; import com.google.appengine.tools.mapreduce.ReducerInput; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import google.registry.config.ConfigModule.Config; import google.registry.gcs.GcsUtils; import google.registry.mapreduce.MapreduceRunner; @@ -38,16 +37,13 @@ import google.registry.model.registry.Registry.TldType; import google.registry.request.Action; import google.registry.request.Response; import google.registry.util.FormattingLogger; - -import org.joda.time.DateTime; - import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.Writer; - import javax.inject.Inject; +import org.joda.time.DateTime; /** * A mapreduce that exports the list of active domains on all real TLDs to Google Cloud Storage. diff --git a/java/google/registry/export/ExportRequestModule.java b/java/google/registry/export/ExportRequestModule.java index 3296c3b52..5f42531e8 100644 --- a/java/google/registry/export/ExportRequestModule.java +++ b/java/google/registry/export/ExportRequestModule.java @@ -28,10 +28,8 @@ import static google.registry.request.RequestParameters.extractRequiredParameter import dagger.Module; import dagger.Provides; - import google.registry.request.Header; import google.registry.request.Parameter; - import javax.servlet.http.HttpServletRequest; /** Dagger module for data export tasks. */ diff --git a/java/google/registry/export/ExportReservedTermsAction.java b/java/google/registry/export/ExportReservedTermsAction.java index 40ba89970..c0e365fbd 100644 --- a/java/google/registry/export/ExportReservedTermsAction.java +++ b/java/google/registry/export/ExportReservedTermsAction.java @@ -24,7 +24,6 @@ import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.net.MediaType; - import google.registry.model.registry.Registry; import google.registry.request.Action; import google.registry.request.Parameter; @@ -32,7 +31,6 @@ import google.registry.request.RequestParameters; import google.registry.request.Response; import google.registry.storage.drive.DriveConnection; import google.registry.util.FormattingLogger; - import javax.inject.Inject; /** Action that exports the publicly viewable reserved terms list for a TLD to Google Drive. */ diff --git a/java/google/registry/export/ExportSnapshotServlet.java b/java/google/registry/export/ExportSnapshotServlet.java index afb708e87..a5dc444a0 100644 --- a/java/google/registry/export/ExportSnapshotServlet.java +++ b/java/google/registry/export/ExportSnapshotServlet.java @@ -21,15 +21,12 @@ import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.net.MediaType; - import google.registry.config.RegistryEnvironment; import google.registry.util.Clock; import google.registry.util.FormattingLogger; import google.registry.util.NonFinalForTesting; import google.registry.util.SystemClock; - import java.io.IOException; - import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/java/google/registry/export/ExportUtils.java b/java/google/registry/export/ExportUtils.java index cbaf0bebc..f955b88aa 100644 --- a/java/google/registry/export/ExportUtils.java +++ b/java/google/registry/export/ExportUtils.java @@ -17,14 +17,11 @@ package google.registry.export; import static google.registry.model.registry.label.ReservationType.UNRESERVED; import com.google.common.base.Joiner; - import com.googlecode.objectify.Key; - import google.registry.config.RegistryEnvironment; import google.registry.model.registry.Registry; import google.registry.model.registry.label.ReservedList; import google.registry.model.registry.label.ReservedList.ReservedListEntry; - import java.util.Set; import java.util.TreeSet; diff --git a/java/google/registry/export/LoadSnapshotAction.java b/java/google/registry/export/LoadSnapshotAction.java index 3926eeccf..06e4e64cd 100644 --- a/java/google/registry/export/LoadSnapshotAction.java +++ b/java/google/registry/export/LoadSnapshotAction.java @@ -34,7 +34,6 @@ import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import google.registry.bigquery.BigqueryFactory; import google.registry.bigquery.BigqueryUtils.SourceFormat; import google.registry.bigquery.BigqueryUtils.WriteDisposition; @@ -46,12 +45,9 @@ import google.registry.request.HttpException.InternalServerErrorException; import google.registry.request.Parameter; import google.registry.util.Clock; import google.registry.util.FormattingLogger; - -import org.joda.time.DateTime; - import java.io.IOException; - import javax.inject.Inject; +import org.joda.time.DateTime; /** Action to load a Datastore snapshot from Google Cloud Storage into BigQuery. */ @Action(path = LoadSnapshotAction.PATH, method = POST) diff --git a/java/google/registry/export/PublishDetailReportAction.java b/java/google/registry/export/PublishDetailReportAction.java index ef8f5dee3..1a5f2b267 100644 --- a/java/google/registry/export/PublishDetailReportAction.java +++ b/java/google/registry/export/PublishDetailReportAction.java @@ -21,7 +21,6 @@ import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.common.collect.ImmutableMap; import com.google.common.io.ByteStreams; import com.google.common.net.MediaType; - import google.registry.gcs.GcsUtils; import google.registry.model.registrar.Registrar; import google.registry.request.Action; @@ -31,11 +30,9 @@ import google.registry.request.JsonActionRunner; import google.registry.request.JsonActionRunner.JsonAction; import google.registry.storage.drive.DriveConnection; import google.registry.util.FormattingLogger; - import java.io.FileNotFoundException; import java.io.InputStream; import java.util.Map; - import javax.inject.Inject; /** Publish a single registrar detail report from GCS to Drive. */ diff --git a/java/google/registry/export/SyncGroupMembersAction.java b/java/google/registry/export/SyncGroupMembersAction.java index 850fff77d..254e07a31 100644 --- a/java/google/registry/export/SyncGroupMembersAction.java +++ b/java/google/registry/export/SyncGroupMembersAction.java @@ -27,9 +27,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; - import com.googlecode.objectify.VoidWork; - import google.registry.config.ConfigModule.Config; import google.registry.groups.GroupsConnection; import google.registry.groups.GroupsConnection.Role; @@ -39,12 +37,10 @@ import google.registry.request.Action; import google.registry.request.Response; import google.registry.util.Concurrent; import google.registry.util.FormattingLogger; - import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Set; - import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/java/google/registry/export/UpdateSnapshotViewAction.java b/java/google/registry/export/UpdateSnapshotViewAction.java index 5284756d9..2420f69ea 100644 --- a/java/google/registry/export/UpdateSnapshotViewAction.java +++ b/java/google/registry/export/UpdateSnapshotViewAction.java @@ -22,7 +22,6 @@ import com.google.api.services.bigquery.model.TableReference; import com.google.api.services.bigquery.model.ViewDefinition; import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TaskOptions.Method; - import google.registry.bigquery.BigqueryFactory; import google.registry.config.ConfigModule.Config; import google.registry.request.Action; @@ -30,9 +29,7 @@ import google.registry.request.HttpException.InternalServerErrorException; import google.registry.request.Parameter; import google.registry.util.FormattingLogger; import google.registry.util.SqlTemplate; - import java.io.IOException; - import javax.inject.Inject; /** Update a well-known view to point at a certain datastore snapshot table in BigQuery. */ diff --git a/java/google/registry/export/sheet/SheetModule.java b/java/google/registry/export/sheet/SheetModule.java index 0373c8025..d283b9e88 100644 --- a/java/google/registry/export/sheet/SheetModule.java +++ b/java/google/registry/export/sheet/SheetModule.java @@ -17,12 +17,9 @@ package google.registry.export.sheet; import static com.google.common.base.Strings.emptyToNull; import com.google.common.base.Optional; - import dagger.Module; import dagger.Provides; - import google.registry.request.Parameter; - import javax.servlet.http.HttpServletRequest; /** Dagger module for the sheet package. */ diff --git a/java/google/registry/export/sheet/SheetSynchronizer.java b/java/google/registry/export/sheet/SheetSynchronizer.java index 87dfd4626..96f5d9dd9 100644 --- a/java/google/registry/export/sheet/SheetSynchronizer.java +++ b/java/google/registry/export/sheet/SheetSynchronizer.java @@ -23,11 +23,9 @@ import com.google.gdata.data.spreadsheet.ListFeed; import com.google.gdata.data.spreadsheet.SpreadsheetEntry; import com.google.gdata.data.spreadsheet.WorksheetEntry; import com.google.gdata.util.ServiceException; - import java.io.IOException; import java.net.URL; import java.util.List; - import javax.inject.Inject; /** Generic data synchronization utility for Google Spreadsheets. */ diff --git a/java/google/registry/export/sheet/SpreadsheetServiceModule.java b/java/google/registry/export/sheet/SpreadsheetServiceModule.java index 20d265b1b..57b229ea3 100644 --- a/java/google/registry/export/sheet/SpreadsheetServiceModule.java +++ b/java/google/registry/export/sheet/SpreadsheetServiceModule.java @@ -17,7 +17,6 @@ package google.registry.export.sheet; import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; import com.google.common.collect.ImmutableList; import com.google.gdata.client.spreadsheet.SpreadsheetService; - import dagger.Module; import dagger.Provides; diff --git a/java/google/registry/export/sheet/SyncRegistrarsSheet.java b/java/google/registry/export/sheet/SyncRegistrarsSheet.java index 71f595411..dc80e1ad8 100644 --- a/java/google/registry/export/sheet/SyncRegistrarsSheet.java +++ b/java/google/registry/export/sheet/SyncRegistrarsSheet.java @@ -32,20 +32,16 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Ordering; import com.google.gdata.util.ServiceException; - import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarAddress; import google.registry.model.registrar.RegistrarContact; import google.registry.util.Clock; import google.registry.util.DateTimeUtils; - -import org.joda.time.DateTime; -import org.joda.time.Duration; - import java.io.IOException; - import javax.annotation.Nullable; import javax.inject.Inject; +import org.joda.time.DateTime; +import org.joda.time.Duration; /** * Class for synchronizing all {@link Registrar} datastore objects to a Google Spreadsheet. diff --git a/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java b/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java index 9bb5e15f3..2b397230c 100644 --- a/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java +++ b/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java @@ -29,7 +29,6 @@ import com.google.appengine.api.taskqueue.TaskHandle; import com.google.appengine.api.taskqueue.TaskOptions.Method; import com.google.common.base.Optional; import com.google.gdata.util.ServiceException; - import google.registry.config.ConfigModule.Config; import google.registry.model.server.Lock; import google.registry.request.Action; @@ -37,14 +36,11 @@ import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.util.FormattingLogger; import google.registry.util.NonFinalForTesting; - -import org.joda.time.Duration; - import java.io.IOException; import java.util.concurrent.Callable; - import javax.annotation.Nullable; import javax.inject.Inject; +import org.joda.time.Duration; /** * Action for synchronizing the registrars spreadsheet. diff --git a/java/google/registry/flows/CheckApiAction.java b/java/google/registry/flows/CheckApiAction.java index 572e3c475..407ded127 100644 --- a/java/google/registry/flows/CheckApiAction.java +++ b/java/google/registry/flows/CheckApiAction.java @@ -30,10 +30,8 @@ import com.google.common.net.InternetDomainName; import com.google.common.net.MediaType; import com.google.template.soy.SoyFileSet; import com.google.template.soy.tofu.SoyTofu; - import dagger.Module; import dagger.Provides; - import google.registry.config.RegistryConfig; import google.registry.flows.soy.DomainCheckFeeEppSoyInfo; import google.registry.model.domain.fee.FeeCheckResponseExtension; @@ -46,9 +44,7 @@ import google.registry.request.Parameter; import google.registry.request.RequestParameters; import google.registry.request.Response; import google.registry.util.FormattingLogger; - import java.util.Map; - import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; diff --git a/java/google/registry/flows/EppConsoleAction.java b/java/google/registry/flows/EppConsoleAction.java index 2bc1ad20c..6e0061d31 100644 --- a/java/google/registry/flows/EppConsoleAction.java +++ b/java/google/registry/flows/EppConsoleAction.java @@ -19,7 +19,6 @@ import static com.google.appengine.api.users.UserServiceFactory.getUserService; import google.registry.request.Action; import google.registry.request.Action.Method; import google.registry.request.Payload; - import javax.inject.Inject; import javax.servlet.http.HttpSession; diff --git a/java/google/registry/flows/EppController.java b/java/google/registry/flows/EppController.java index d9c4d981e..5c33fac65 100644 --- a/java/google/registry/flows/EppController.java +++ b/java/google/registry/flows/EppController.java @@ -18,7 +18,6 @@ import static google.registry.flows.EppXmlTransformer.unmarshal; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; - import google.registry.flows.FlowModule.EppExceptionInProviderException; import google.registry.model.eppcommon.Trid; import google.registry.model.eppinput.EppInput; @@ -29,7 +28,6 @@ import google.registry.model.eppoutput.Result.Code; import google.registry.monitoring.whitebox.EppMetrics; import google.registry.util.Clock; import google.registry.util.FormattingLogger; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/EppException.java b/java/google/registry/flows/EppException.java index 616f83a39..405810d18 100644 --- a/java/google/registry/flows/EppException.java +++ b/java/google/registry/flows/EppException.java @@ -20,13 +20,11 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; - import google.registry.model.annotations.ExternalMessagingName; import google.registry.model.eppinput.EppInput.InnerCommand; import google.registry.model.eppinput.EppInput.ResourceCommandWrapper; import google.registry.model.eppoutput.Result; import google.registry.model.eppoutput.Result.Code; - import java.lang.annotation.Documented; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; diff --git a/java/google/registry/flows/EppRequestHandler.java b/java/google/registry/flows/EppRequestHandler.java index 274c5df73..4f140e295 100644 --- a/java/google/registry/flows/EppRequestHandler.java +++ b/java/google/registry/flows/EppRequestHandler.java @@ -21,10 +21,8 @@ import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.net.MediaType; - import google.registry.request.Response; import google.registry.util.FormattingLogger; - import javax.inject.Inject; /** Handle an EPP request and response. */ diff --git a/java/google/registry/flows/EppTlsAction.java b/java/google/registry/flows/EppTlsAction.java index b1bdf4b99..60abafdf1 100644 --- a/java/google/registry/flows/EppTlsAction.java +++ b/java/google/registry/flows/EppTlsAction.java @@ -18,7 +18,6 @@ import google.registry.request.Action; import google.registry.request.Action.Method; import google.registry.request.Payload; import google.registry.util.FormattingLogger; - import javax.inject.Inject; import javax.servlet.http.HttpSession; diff --git a/java/google/registry/flows/EppToolAction.java b/java/google/registry/flows/EppToolAction.java index ac2ebb985..f44dcb98e 100644 --- a/java/google/registry/flows/EppToolAction.java +++ b/java/google/registry/flows/EppToolAction.java @@ -20,12 +20,10 @@ import static java.nio.charset.StandardCharsets.UTF_8; import dagger.Module; import dagger.Provides; - import google.registry.model.eppcommon.ProtocolDefinition; import google.registry.request.Action; import google.registry.request.Action.Method; import google.registry.request.Parameter; - import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; diff --git a/java/google/registry/flows/EppXmlTransformer.java b/java/google/registry/flows/EppXmlTransformer.java index ac361fa50..5c571717c 100644 --- a/java/google/registry/flows/EppXmlTransformer.java +++ b/java/google/registry/flows/EppXmlTransformer.java @@ -23,7 +23,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Throwables; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; - import google.registry.flows.EppException.ParameterValueRangeErrorException; import google.registry.flows.EppException.ParameterValueSyntaxErrorException; import google.registry.flows.EppException.SyntaxErrorException; @@ -39,7 +38,6 @@ import google.registry.util.FormattingLogger; import google.registry.xml.ValidationMode; import google.registry.xml.XmlException; import google.registry.xml.XmlTransformer; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/java/google/registry/flows/Flow.java b/java/google/registry/flows/Flow.java index d3380138b..80185a7e6 100644 --- a/java/google/registry/flows/Flow.java +++ b/java/google/registry/flows/Flow.java @@ -16,7 +16,6 @@ package google.registry.flows; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import google.registry.model.eppcommon.Trid; import google.registry.model.eppinput.EppInput; import google.registry.model.eppinput.EppInput.CommandExtension; @@ -25,12 +24,10 @@ import google.registry.model.eppoutput.EppResponse; import google.registry.model.eppoutput.EppResponse.ResponseData; import google.registry.model.eppoutput.EppResponse.ResponseExtension; import google.registry.model.eppoutput.Result; - -import org.joda.time.DateTime; - import java.util.Collections; import java.util.HashSet; import java.util.Set; +import org.joda.time.DateTime; /** * An abstract EPP flow. diff --git a/java/google/registry/flows/FlowComponent.java b/java/google/registry/flows/FlowComponent.java index 8b06c8487..515a9c398 100644 --- a/java/google/registry/flows/FlowComponent.java +++ b/java/google/registry/flows/FlowComponent.java @@ -17,7 +17,6 @@ package google.registry.flows; import dagger.Module; import dagger.Provides; import dagger.Subcomponent; - import google.registry.flows.contact.ContactCheckFlow; import google.registry.flows.contact.ContactCreateFlow; import google.registry.flows.contact.ContactDeleteFlow; diff --git a/java/google/registry/flows/FlowModule.java b/java/google/registry/flows/FlowModule.java index 878b4c257..baacfeac1 100644 --- a/java/google/registry/flows/FlowModule.java +++ b/java/google/registry/flows/FlowModule.java @@ -18,13 +18,10 @@ import static com.google.common.base.Preconditions.checkState; import dagger.Module; import dagger.Provides; - import google.registry.flows.picker.FlowPicker; import google.registry.model.eppcommon.Trid; import google.registry.model.eppinput.EppInput; - import java.lang.annotation.Documented; - import javax.annotation.Nullable; import javax.inject.Qualifier; diff --git a/java/google/registry/flows/FlowRunner.java b/java/google/registry/flows/FlowRunner.java index 4b81d06b1..2306fe8f0 100644 --- a/java/google/registry/flows/FlowRunner.java +++ b/java/google/registry/flows/FlowRunner.java @@ -22,9 +22,7 @@ import static google.registry.xml.XmlTransformer.prettyPrint; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; - import com.googlecode.objectify.Work; - import google.registry.flows.FlowModule.ClientId; import google.registry.flows.FlowModule.DryRun; import google.registry.flows.FlowModule.InputXml; @@ -36,13 +34,11 @@ import google.registry.model.eppoutput.EppOutput; import google.registry.monitoring.whitebox.EppMetrics; import google.registry.util.Clock; import google.registry.util.FormattingLogger; - -import org.joda.time.DateTime; -import org.json.simple.JSONValue; - import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Provider; +import org.joda.time.DateTime; +import org.json.simple.JSONValue; /** Run a flow, either transactionally or not, with logging and retrying as needed. */ public class FlowRunner { diff --git a/java/google/registry/flows/FlowScope.java b/java/google/registry/flows/FlowScope.java index 59b5cc2d8..d1901e924 100644 --- a/java/google/registry/flows/FlowScope.java +++ b/java/google/registry/flows/FlowScope.java @@ -19,7 +19,6 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; - import javax.inject.Scope; /** diff --git a/java/google/registry/flows/GaeUserCredentials.java b/java/google/registry/flows/GaeUserCredentials.java index c7c83a6f4..2d4d91345 100644 --- a/java/google/registry/flows/GaeUserCredentials.java +++ b/java/google/registry/flows/GaeUserCredentials.java @@ -20,11 +20,9 @@ import static com.google.common.base.Strings.nullToEmpty; import com.google.appengine.api.users.User; import com.google.common.annotations.VisibleForTesting; - import google.registry.flows.EppException.AuthenticationErrorException; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; - import javax.annotation.Nullable; /** Credentials provided by {@link com.google.appengine.api.users.UserService}. */ diff --git a/java/google/registry/flows/HttpSessionMetadata.java b/java/google/registry/flows/HttpSessionMetadata.java index 7dd7b838b..7a912dc66 100644 --- a/java/google/registry/flows/HttpSessionMetadata.java +++ b/java/google/registry/flows/HttpSessionMetadata.java @@ -19,9 +19,7 @@ import static google.registry.util.CollectionUtils.nullToEmpty; import com.google.common.base.Joiner; import com.google.common.base.Optional; - import java.util.Set; - import javax.servlet.http.HttpSession; /** A metadata class that is a wrapper around {@link HttpSession}. */ diff --git a/java/google/registry/flows/LoggedInFlow.java b/java/google/registry/flows/LoggedInFlow.java index 1a2f72c90..9674c6428 100644 --- a/java/google/registry/flows/LoggedInFlow.java +++ b/java/google/registry/flows/LoggedInFlow.java @@ -24,7 +24,6 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; - import google.registry.flows.EppException.CommandUseErrorException; import google.registry.flows.EppException.SyntaxErrorException; import google.registry.flows.EppException.UnimplementedExtensionException; @@ -33,7 +32,6 @@ import google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension; import google.registry.model.eppinput.EppInput.CommandExtension; import google.registry.model.registrar.Registrar; import google.registry.util.FormattingLogger; - import java.util.Set; /** A flow that requires being logged in. */ diff --git a/java/google/registry/flows/ResourceAsyncDeleteFlow.java b/java/google/registry/flows/ResourceAsyncDeleteFlow.java index d18f28f49..ae0b78835 100644 --- a/java/google/registry/flows/ResourceAsyncDeleteFlow.java +++ b/java/google/registry/flows/ResourceAsyncDeleteFlow.java @@ -19,7 +19,6 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import com.googlecode.objectify.Ref; import com.googlecode.objectify.Work; - import google.registry.flows.EppException.AssociationProhibitsOperationException; import google.registry.model.EppResource; import google.registry.model.EppResource.Builder; diff --git a/java/google/registry/flows/ResourceCheckFlow.java b/java/google/registry/flows/ResourceCheckFlow.java index ac7d52479..4503ff042 100644 --- a/java/google/registry/flows/ResourceCheckFlow.java +++ b/java/google/registry/flows/ResourceCheckFlow.java @@ -17,7 +17,6 @@ package google.registry.flows; import static google.registry.model.eppoutput.Result.Code.Success; import com.google.common.collect.ImmutableList; - import google.registry.config.RegistryEnvironment; import google.registry.flows.EppException.ParameterValuePolicyErrorException; import google.registry.model.EppResource; @@ -25,7 +24,6 @@ import google.registry.model.eppinput.ResourceCommand.ResourceCheck; import google.registry.model.eppoutput.CheckData; import google.registry.model.eppoutput.EppOutput; import google.registry.model.eppoutput.EppResponse.ResponseExtension; - import java.util.List; /** diff --git a/java/google/registry/flows/ResourceCreateFlow.java b/java/google/registry/flows/ResourceCreateFlow.java index a03393d5d..cd75c547f 100644 --- a/java/google/registry/flows/ResourceCreateFlow.java +++ b/java/google/registry/flows/ResourceCreateFlow.java @@ -17,9 +17,7 @@ package google.registry.flows; import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.annotations.VisibleForTesting; - import com.googlecode.objectify.Key; - import google.registry.flows.EppException.ObjectAlreadyExistsException; import google.registry.model.EppResource; import google.registry.model.EppResource.Builder; @@ -31,7 +29,6 @@ import google.registry.model.index.DomainApplicationIndex; import google.registry.model.index.EppResourceIndex; import google.registry.model.index.ForeignKeyIndex; import google.registry.util.TypeUtils.TypeInstantiator; - import javax.annotation.Nullable; /** diff --git a/java/google/registry/flows/ResourceCreateOrMutateFlow.java b/java/google/registry/flows/ResourceCreateOrMutateFlow.java index c6ad331d0..1f24cfdf9 100644 --- a/java/google/registry/flows/ResourceCreateOrMutateFlow.java +++ b/java/google/registry/flows/ResourceCreateOrMutateFlow.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkState; import static google.registry.model.ofy.ObjectifyService.ofy; import com.googlecode.objectify.Key; - import google.registry.flows.EppException.AuthorizationErrorException; import google.registry.flows.FlowModule.InputXml; import google.registry.model.EppResource; @@ -28,7 +27,6 @@ import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; import google.registry.model.eppoutput.EppOutput; import google.registry.model.reporting.HistoryEntry; import google.registry.util.TypeUtils.TypeInstantiator; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/ResourceDeleteFlow.java b/java/google/registry/flows/ResourceDeleteFlow.java index f6bdc5956..4db8c1f94 100644 --- a/java/google/registry/flows/ResourceDeleteFlow.java +++ b/java/google/registry/flows/ResourceDeleteFlow.java @@ -18,14 +18,12 @@ import static google.registry.model.eppoutput.Result.Code.Success; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import google.registry.model.EppResource; import google.registry.model.eppcommon.StatusValue; import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; import google.registry.model.eppoutput.EppOutput; import google.registry.model.eppoutput.EppResponse.ResponseExtension; import google.registry.model.eppoutput.Result.Code; - import java.util.Set; /** diff --git a/java/google/registry/flows/ResourceFlow.java b/java/google/registry/flows/ResourceFlow.java index dd9833d71..b5b9a8254 100644 --- a/java/google/registry/flows/ResourceFlow.java +++ b/java/google/registry/flows/ResourceFlow.java @@ -16,7 +16,6 @@ package google.registry.flows; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; - import google.registry.flows.EppException.CommandUseErrorException; import google.registry.model.EppResource; import google.registry.model.eppinput.EppInput.ResourceCommandWrapper; diff --git a/java/google/registry/flows/ResourceFlowUtils.java b/java/google/registry/flows/ResourceFlowUtils.java index c165bc267..fbb853c08 100644 --- a/java/google/registry/flows/ResourceFlowUtils.java +++ b/java/google/registry/flows/ResourceFlowUtils.java @@ -21,7 +21,6 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; - import google.registry.flows.EppException.AuthorizationErrorException; import google.registry.flows.EppException.InvalidAuthorizationInformationErrorException; import google.registry.model.EppResource; @@ -44,7 +43,6 @@ import google.registry.model.transfer.TransferResponse; import google.registry.model.transfer.TransferResponse.ContactTransferResponse; import google.registry.model.transfer.TransferResponse.DomainTransferResponse; import google.registry.model.transfer.TransferStatus; - import org.joda.time.DateTime; /** Static utility functions for resource transfer flows. */ diff --git a/java/google/registry/flows/ResourceInfoFlow.java b/java/google/registry/flows/ResourceInfoFlow.java index 91c695671..369a8eeb2 100644 --- a/java/google/registry/flows/ResourceInfoFlow.java +++ b/java/google/registry/flows/ResourceInfoFlow.java @@ -18,7 +18,6 @@ import static google.registry.model.EppResourceUtils.cloneResourceWithLinkedStat import static google.registry.model.eppoutput.Result.Code.Success; import com.google.common.collect.ImmutableList; - import google.registry.model.EppResource; import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; import google.registry.model.eppoutput.EppOutput; diff --git a/java/google/registry/flows/ResourceTransferApproveFlow.java b/java/google/registry/flows/ResourceTransferApproveFlow.java index 186089704..33a1e5c6b 100644 --- a/java/google/registry/flows/ResourceTransferApproveFlow.java +++ b/java/google/registry/flows/ResourceTransferApproveFlow.java @@ -19,7 +19,6 @@ import static google.registry.flows.ResourceFlowUtils.createTransferResponse; import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.collect.ImmutableList; - import google.registry.model.EppResource; import google.registry.model.EppResource.Builder; import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; diff --git a/java/google/registry/flows/ResourceTransferCancelFlow.java b/java/google/registry/flows/ResourceTransferCancelFlow.java index 650187cdc..2ccd18b58 100644 --- a/java/google/registry/flows/ResourceTransferCancelFlow.java +++ b/java/google/registry/flows/ResourceTransferCancelFlow.java @@ -18,7 +18,6 @@ import static google.registry.flows.ResourceFlowUtils.createTransferResponse; import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.collect.ImmutableList; - import google.registry.flows.EppException.AuthorizationErrorException; import google.registry.model.EppResource; import google.registry.model.EppResource.Builder; diff --git a/java/google/registry/flows/ResourceTransferRejectFlow.java b/java/google/registry/flows/ResourceTransferRejectFlow.java index 0ec933d31..c6fb42fa7 100644 --- a/java/google/registry/flows/ResourceTransferRejectFlow.java +++ b/java/google/registry/flows/ResourceTransferRejectFlow.java @@ -19,7 +19,6 @@ import static google.registry.flows.ResourceFlowUtils.createTransferResponse; import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.collect.ImmutableList; - import google.registry.model.EppResource; import google.registry.model.EppResource.Builder; import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; diff --git a/java/google/registry/flows/ResourceTransferRequestFlow.java b/java/google/registry/flows/ResourceTransferRequestFlow.java index 0ef442be7..01a75fdb7 100644 --- a/java/google/registry/flows/ResourceTransferRequestFlow.java +++ b/java/google/registry/flows/ResourceTransferRequestFlow.java @@ -23,9 +23,7 @@ import static google.registry.util.CollectionUtils.union; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; - import google.registry.flows.EppException.AuthorizationErrorException; import google.registry.flows.EppException.CommandUseErrorException; import google.registry.flows.EppException.ObjectPendingTransferException; @@ -39,12 +37,10 @@ import google.registry.model.poll.PollMessage; import google.registry.model.transfer.TransferData; import google.registry.model.transfer.TransferData.TransferServerApproveEntity; import google.registry.model.transfer.TransferStatus; - +import java.util.Set; import org.joda.time.DateTime; import org.joda.time.Duration; -import java.util.Set; - /** * An EPP flow that requests a transfer on a resource. * diff --git a/java/google/registry/flows/ResourceUpdateFlow.java b/java/google/registry/flows/ResourceUpdateFlow.java index 9331ff687..5738fa367 100644 --- a/java/google/registry/flows/ResourceUpdateFlow.java +++ b/java/google/registry/flows/ResourceUpdateFlow.java @@ -18,7 +18,6 @@ import static google.registry.model.eppoutput.Result.Code.Success; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; - import google.registry.flows.EppException.ParameterValuePolicyErrorException; import google.registry.flows.EppException.ParameterValueRangeErrorException; import google.registry.flows.EppException.StatusProhibitsOperationException; @@ -28,7 +27,6 @@ import google.registry.model.eppcommon.StatusValue; import google.registry.model.eppinput.ResourceCommand.AddRemoveSameValueException; import google.registry.model.eppinput.ResourceCommand.ResourceUpdate; import google.registry.model.eppoutput.EppOutput; - import java.util.Set; /** diff --git a/java/google/registry/flows/SingleResourceFlow.java b/java/google/registry/flows/SingleResourceFlow.java index 51e108406..f098e44be 100644 --- a/java/google/registry/flows/SingleResourceFlow.java +++ b/java/google/registry/flows/SingleResourceFlow.java @@ -19,13 +19,11 @@ import static google.registry.model.EppResourceUtils.loadByUniqueId; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; - import google.registry.flows.EppException.StatusProhibitsOperationException; import google.registry.model.EppResource; import google.registry.model.domain.launch.ApplicationIdTargetExtension; import google.registry.model.eppcommon.StatusValue; import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; - import java.util.Set; /** diff --git a/java/google/registry/flows/StatelessRequestSessionMetadata.java b/java/google/registry/flows/StatelessRequestSessionMetadata.java index 39c393160..0d8825cd1 100644 --- a/java/google/registry/flows/StatelessRequestSessionMetadata.java +++ b/java/google/registry/flows/StatelessRequestSessionMetadata.java @@ -20,7 +20,6 @@ import static google.registry.util.CollectionUtils.nullToEmpty; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; - import java.util.Set; /** A read-only {@link SessionMetadata} that doesn't support login/logout. */ diff --git a/java/google/registry/flows/TlsCredentials.java b/java/google/registry/flows/TlsCredentials.java index 7aae1764a..be7a06bc7 100644 --- a/java/google/registry/flows/TlsCredentials.java +++ b/java/google/registry/flows/TlsCredentials.java @@ -24,18 +24,14 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.net.HostAndPort; import com.google.common.net.InetAddresses; - import dagger.Module; import dagger.Provides; - import google.registry.flows.EppException.AuthenticationErrorException; import google.registry.model.registrar.Registrar; import google.registry.request.Header; import google.registry.util.CidrAddressBlock; import google.registry.util.FormattingLogger; - import java.net.InetAddress; - import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; diff --git a/java/google/registry/flows/async/AsyncFlowUtils.java b/java/google/registry/flows/async/AsyncFlowUtils.java index 579629a09..42efb7d16 100644 --- a/java/google/registry/flows/async/AsyncFlowUtils.java +++ b/java/google/registry/flows/async/AsyncFlowUtils.java @@ -24,13 +24,10 @@ import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TaskOptions.Method; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; - import google.registry.config.RegistryEnvironment; import google.registry.util.FormattingLogger; - -import org.joda.time.Duration; - import java.util.Map.Entry; +import org.joda.time.Duration; /** Utility methods specific to async flows. */ public final class AsyncFlowUtils { diff --git a/java/google/registry/flows/async/AsyncFlowsModule.java b/java/google/registry/flows/async/AsyncFlowsModule.java index 1ecafc955..7ec5431b6 100644 --- a/java/google/registry/flows/async/AsyncFlowsModule.java +++ b/java/google/registry/flows/async/AsyncFlowsModule.java @@ -23,9 +23,7 @@ import static google.registry.request.RequestParameters.extractRequiredParameter import dagger.Module; import dagger.Provides; - import google.registry.request.Parameter; - import javax.servlet.http.HttpServletRequest; /** Dagger module for the async flows package. */ diff --git a/java/google/registry/flows/async/DeleteContactResourceAction.java b/java/google/registry/flows/async/DeleteContactResourceAction.java index 812e21c3d..7de91fe30 100644 --- a/java/google/registry/flows/async/DeleteContactResourceAction.java +++ b/java/google/registry/flows/async/DeleteContactResourceAction.java @@ -17,16 +17,13 @@ package google.registry.flows.async; import static google.registry.flows.ResourceFlowUtils.handlePendingTransferOnDelete; import com.googlecode.objectify.Ref; - import google.registry.model.contact.ContactResource; import google.registry.model.domain.DomainBase; import google.registry.model.reporting.HistoryEntry; import google.registry.model.reporting.HistoryEntry.Type; import google.registry.request.Action; - -import org.joda.time.DateTime; - import javax.inject.Inject; +import org.joda.time.DateTime; /** * A mapreduce to delete the specified ContactResource, but ONLY if it is not referred to by any diff --git a/java/google/registry/flows/async/DeleteEppResourceAction.java b/java/google/registry/flows/async/DeleteEppResourceAction.java index fd68c3b61..b5fe402f4 100644 --- a/java/google/registry/flows/async/DeleteEppResourceAction.java +++ b/java/google/registry/flows/async/DeleteEppResourceAction.java @@ -29,11 +29,9 @@ import com.google.appengine.tools.mapreduce.Reducer; import com.google.appengine.tools.mapreduce.ReducerInput; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; import com.googlecode.objectify.Work; - import google.registry.mapreduce.MapreduceRunner; import google.registry.mapreduce.inputs.EppResourceInputs; import google.registry.mapreduce.inputs.NullInput; @@ -49,10 +47,8 @@ import google.registry.request.Response; import google.registry.util.Clock; import google.registry.util.FormattingLogger; import google.registry.util.TypeUtils.TypeInstantiator; - -import org.joda.time.DateTime; - import javax.inject.Inject; +import org.joda.time.DateTime; /** * A mapreduce to delete the specified EPP resource, but ONLY if it is not referred to by any diff --git a/java/google/registry/flows/async/DeleteHostResourceAction.java b/java/google/registry/flows/async/DeleteHostResourceAction.java index 4414402f1..5945c1445 100644 --- a/java/google/registry/flows/async/DeleteHostResourceAction.java +++ b/java/google/registry/flows/async/DeleteHostResourceAction.java @@ -17,17 +17,14 @@ package google.registry.flows.async; import static google.registry.model.ofy.ObjectifyService.ofy; import com.googlecode.objectify.Ref; - import google.registry.dns.DnsQueue; import google.registry.model.domain.DomainBase; import google.registry.model.host.HostResource; import google.registry.model.reporting.HistoryEntry; import google.registry.model.reporting.HistoryEntry.Type; import google.registry.request.Action; - -import org.joda.time.DateTime; - import javax.inject.Inject; +import org.joda.time.DateTime; /** * A mapreduce to delete the specified HostResource, but ONLY if it is not referred to by any diff --git a/java/google/registry/flows/async/DnsRefreshForHostRenameAction.java b/java/google/registry/flows/async/DnsRefreshForHostRenameAction.java index 287466464..12fc587a0 100644 --- a/java/google/registry/flows/async/DnsRefreshForHostRenameAction.java +++ b/java/google/registry/flows/async/DnsRefreshForHostRenameAction.java @@ -21,10 +21,8 @@ import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import com.google.appengine.tools.mapreduce.Mapper; import com.google.common.collect.ImmutableList; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.dns.DnsQueue; import google.registry.mapreduce.MapreduceRunner; import google.registry.mapreduce.inputs.EppResourceInputs; @@ -36,10 +34,8 @@ import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.util.FormattingLogger; import google.registry.util.NonFinalForTesting; - -import org.joda.time.DateTime; - import javax.inject.Inject; +import org.joda.time.DateTime; /** * Enqueues DNS refreshes for applicable domains following a host rename. diff --git a/java/google/registry/flows/contact/ContactCheckFlow.java b/java/google/registry/flows/contact/ContactCheckFlow.java index d4ca978cd..5c40bd317 100644 --- a/java/google/registry/flows/contact/ContactCheckFlow.java +++ b/java/google/registry/flows/contact/ContactCheckFlow.java @@ -17,16 +17,13 @@ package google.registry.flows.contact; import static google.registry.model.EppResourceUtils.checkResourcesExist; import com.google.common.collect.ImmutableList; - import google.registry.flows.ResourceCheckFlow; import google.registry.model.contact.ContactCommand.Check; import google.registry.model.contact.ContactResource; import google.registry.model.eppoutput.CheckData; import google.registry.model.eppoutput.CheckData.ContactCheck; import google.registry.model.eppoutput.CheckData.ContactCheckData; - import java.util.Set; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/contact/ContactCreateFlow.java b/java/google/registry/flows/contact/ContactCreateFlow.java index b3818e458..b17ebd383 100644 --- a/java/google/registry/flows/contact/ContactCreateFlow.java +++ b/java/google/registry/flows/contact/ContactCreateFlow.java @@ -28,7 +28,6 @@ import google.registry.model.eppoutput.CreateData.ContactCreateData; import google.registry.model.eppoutput.EppOutput; import google.registry.model.ofy.ObjectifyService; import google.registry.model.reporting.HistoryEntry; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/contact/ContactDeleteFlow.java b/java/google/registry/flows/contact/ContactDeleteFlow.java index 20378b9cf..066d94a7e 100644 --- a/java/google/registry/flows/contact/ContactDeleteFlow.java +++ b/java/google/registry/flows/contact/ContactDeleteFlow.java @@ -20,10 +20,8 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.config.RegistryEnvironment; import google.registry.flows.EppException; import google.registry.flows.ResourceAsyncDeleteFlow; @@ -35,7 +33,6 @@ import google.registry.model.contact.ContactResource; import google.registry.model.contact.ContactResource.Builder; import google.registry.model.domain.DomainBase; import google.registry.model.reporting.HistoryEntry; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/contact/ContactFlowUtils.java b/java/google/registry/flows/contact/ContactFlowUtils.java index ecf85e649..a812fe46e 100644 --- a/java/google/registry/flows/contact/ContactFlowUtils.java +++ b/java/google/registry/flows/contact/ContactFlowUtils.java @@ -19,16 +19,13 @@ import static google.registry.model.contact.PostalInfo.Type.INTERNATIONALIZED; import com.google.common.base.CharMatcher; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; - import google.registry.flows.EppException; import google.registry.flows.EppException.ParameterValuePolicyErrorException; import google.registry.flows.EppException.ParameterValueSyntaxErrorException; import google.registry.model.contact.ContactAddress; import google.registry.model.contact.ContactResource; import google.registry.model.contact.PostalInfo; - import java.util.Set; - import javax.annotation.Nullable; /** Static utility functions for contact flows. */ diff --git a/java/google/registry/flows/contact/ContactInfoFlow.java b/java/google/registry/flows/contact/ContactInfoFlow.java index 648718391..d935d39ca 100644 --- a/java/google/registry/flows/contact/ContactInfoFlow.java +++ b/java/google/registry/flows/contact/ContactInfoFlow.java @@ -17,7 +17,6 @@ package google.registry.flows.contact; import google.registry.flows.ResourceInfoFlow; import google.registry.model.contact.ContactCommand.Info; import google.registry.model.contact.ContactResource; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/contact/ContactTransferApproveFlow.java b/java/google/registry/flows/contact/ContactTransferApproveFlow.java index 5d955bba5..724b11250 100644 --- a/java/google/registry/flows/contact/ContactTransferApproveFlow.java +++ b/java/google/registry/flows/contact/ContactTransferApproveFlow.java @@ -19,7 +19,6 @@ import google.registry.model.contact.ContactCommand.Transfer; import google.registry.model.contact.ContactResource; import google.registry.model.contact.ContactResource.Builder; import google.registry.model.reporting.HistoryEntry; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/contact/ContactTransferCancelFlow.java b/java/google/registry/flows/contact/ContactTransferCancelFlow.java index d70691a54..52f786951 100644 --- a/java/google/registry/flows/contact/ContactTransferCancelFlow.java +++ b/java/google/registry/flows/contact/ContactTransferCancelFlow.java @@ -19,7 +19,6 @@ import google.registry.model.contact.ContactCommand.Transfer; import google.registry.model.contact.ContactResource; import google.registry.model.contact.ContactResource.Builder; import google.registry.model.reporting.HistoryEntry; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/contact/ContactTransferQueryFlow.java b/java/google/registry/flows/contact/ContactTransferQueryFlow.java index e6450abb6..51d514d3a 100644 --- a/java/google/registry/flows/contact/ContactTransferQueryFlow.java +++ b/java/google/registry/flows/contact/ContactTransferQueryFlow.java @@ -17,7 +17,6 @@ package google.registry.flows.contact; import google.registry.flows.ResourceTransferQueryFlow; import google.registry.model.contact.ContactCommand.Transfer; import google.registry.model.contact.ContactResource; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/contact/ContactTransferRejectFlow.java b/java/google/registry/flows/contact/ContactTransferRejectFlow.java index ad0f31f13..78a93c8f7 100644 --- a/java/google/registry/flows/contact/ContactTransferRejectFlow.java +++ b/java/google/registry/flows/contact/ContactTransferRejectFlow.java @@ -19,7 +19,6 @@ import google.registry.model.contact.ContactCommand.Transfer; import google.registry.model.contact.ContactResource; import google.registry.model.contact.ContactResource.Builder; import google.registry.model.reporting.HistoryEntry; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/contact/ContactTransferRequestFlow.java b/java/google/registry/flows/contact/ContactTransferRequestFlow.java index d867efeb7..546619bbe 100644 --- a/java/google/registry/flows/contact/ContactTransferRequestFlow.java +++ b/java/google/registry/flows/contact/ContactTransferRequestFlow.java @@ -19,10 +19,8 @@ import google.registry.flows.ResourceTransferRequestFlow; import google.registry.model.contact.ContactCommand.Transfer; import google.registry.model.contact.ContactResource; import google.registry.model.reporting.HistoryEntry; - -import org.joda.time.Duration; - import javax.inject.Inject; +import org.joda.time.Duration; /** * An EPP flow that requests a transfer on a {@link ContactResource}. diff --git a/java/google/registry/flows/contact/ContactUpdateFlow.java b/java/google/registry/flows/contact/ContactUpdateFlow.java index d0821b490..5d37d77b0 100644 --- a/java/google/registry/flows/contact/ContactUpdateFlow.java +++ b/java/google/registry/flows/contact/ContactUpdateFlow.java @@ -23,7 +23,6 @@ import google.registry.model.contact.ContactCommand.Update; import google.registry.model.contact.ContactResource; import google.registry.model.contact.ContactResource.Builder; import google.registry.model.reporting.HistoryEntry; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/domain/BaseDomainCheckFlow.java b/java/google/registry/flows/domain/BaseDomainCheckFlow.java index ddaab0d10..beff77f31 100644 --- a/java/google/registry/flows/domain/BaseDomainCheckFlow.java +++ b/java/google/registry/flows/domain/BaseDomainCheckFlow.java @@ -21,12 +21,10 @@ import static google.registry.flows.domain.DomainFlowUtils.validateDomainNameWit import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.net.InternetDomainName; - import google.registry.flows.EppException; import google.registry.flows.ResourceCheckFlow; import google.registry.model.domain.DomainCommand.Check; import google.registry.model.domain.DomainResource; - import java.util.Map; /** An EPP flow that checks whether a domain can be provisioned. */ diff --git a/java/google/registry/flows/domain/BaseDomainCreateFlow.java b/java/google/registry/flows/domain/BaseDomainCreateFlow.java index ad2928bed..6eb8926c4 100644 --- a/java/google/registry/flows/domain/BaseDomainCreateFlow.java +++ b/java/google/registry/flows/domain/BaseDomainCreateFlow.java @@ -40,9 +40,7 @@ import static google.registry.util.CollectionUtils.nullToEmpty; import com.google.common.base.Optional; import com.google.common.net.InternetDomainName; - import com.googlecode.objectify.Work; - import google.registry.flows.EppException; import google.registry.flows.EppException.ParameterValuePolicyErrorException; import google.registry.flows.EppException.ParameterValueRangeErrorException; @@ -67,9 +65,7 @@ import google.registry.model.smd.SignedMark; import google.registry.model.tmch.ClaimsListShard; import google.registry.pricing.TldSpecificLogicProxy; import google.registry.pricing.TldSpecificLogicProxy.EppCommandOperations; - import java.util.Set; - import javax.annotation.Nullable; /** diff --git a/java/google/registry/flows/domain/BaseDomainInfoFlow.java b/java/google/registry/flows/domain/BaseDomainInfoFlow.java index ecbc31dec..cc3dee09b 100644 --- a/java/google/registry/flows/domain/BaseDomainInfoFlow.java +++ b/java/google/registry/flows/domain/BaseDomainInfoFlow.java @@ -17,7 +17,6 @@ package google.registry.flows.domain; import static google.registry.util.CollectionUtils.forceEmptyToNull; import com.google.common.collect.ImmutableList; - import google.registry.flows.EppException; import google.registry.flows.ResourceInfoFlow; import google.registry.model.domain.DomainBase; diff --git a/java/google/registry/flows/domain/BaseDomainUpdateFlow.java b/java/google/registry/flows/domain/BaseDomainUpdateFlow.java index a33d35c19..b7e59e3a2 100644 --- a/java/google/registry/flows/domain/BaseDomainUpdateFlow.java +++ b/java/google/registry/flows/domain/BaseDomainUpdateFlow.java @@ -28,7 +28,6 @@ import static google.registry.flows.domain.DomainFlowUtils.validateRequiredConta import static google.registry.flows.domain.DomainFlowUtils.verifyNotInPendingDelete; import com.google.common.collect.ImmutableSet; - import google.registry.flows.EppException; import google.registry.flows.EppException.ParameterValuePolicyErrorException; import google.registry.flows.EppException.RequiredParameterMissingException; @@ -41,7 +40,6 @@ import google.registry.model.domain.secdns.DelegationSignerData; import google.registry.model.domain.secdns.SecDnsUpdateExtension; import google.registry.model.domain.secdns.SecDnsUpdateExtension.Add; import google.registry.model.domain.secdns.SecDnsUpdateExtension.Remove; - import java.util.Set; /** diff --git a/java/google/registry/flows/domain/ClaimsCheckFlow.java b/java/google/registry/flows/domain/ClaimsCheckFlow.java index e3f594b70..ae046b5f4 100644 --- a/java/google/registry/flows/domain/ClaimsCheckFlow.java +++ b/java/google/registry/flows/domain/ClaimsCheckFlow.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.common.net.InternetDomainName; - import google.registry.flows.EppException; import google.registry.model.domain.launch.LaunchCheckExtension; import google.registry.model.domain.launch.LaunchCheckResponseExtension; @@ -32,9 +31,7 @@ import google.registry.model.eppoutput.EppResponse.ResponseExtension; import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.TldState; import google.registry.model.tmch.ClaimsListShard; - import java.util.Map.Entry; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/domain/DomainAllocateFlow.java b/java/google/registry/flows/domain/DomainAllocateFlow.java index 98fc5d9f7..1630c1472 100644 --- a/java/google/registry/flows/domain/DomainAllocateFlow.java +++ b/java/google/registry/flows/domain/DomainAllocateFlow.java @@ -23,9 +23,7 @@ import static google.registry.util.CollectionUtils.isNullOrEmpty; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Ref; - import google.registry.flows.EppException; import google.registry.flows.EppException.AuthorizationErrorException; import google.registry.flows.EppException.ObjectDoesNotExistException; @@ -47,7 +45,6 @@ import google.registry.model.registry.Registry; import google.registry.model.registry.label.ReservationType; import google.registry.model.reporting.HistoryEntry; import google.registry.tmch.LordnTask; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/domain/DomainApplicationCreateFlow.java b/java/google/registry/flows/domain/DomainApplicationCreateFlow.java index 48a0221bf..cb5e92c0c 100644 --- a/java/google/registry/flows/domain/DomainApplicationCreateFlow.java +++ b/java/google/registry/flows/domain/DomainApplicationCreateFlow.java @@ -24,7 +24,6 @@ import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import google.registry.flows.EppException; import google.registry.flows.EppException.CommandUseErrorException; import google.registry.flows.EppException.ObjectAlreadyExistsException; @@ -47,9 +46,7 @@ import google.registry.model.registry.Registry.TldState; import google.registry.model.reporting.HistoryEntry; import google.registry.model.smd.AbstractSignedMark; import google.registry.model.smd.EncodedSignedMark; - import java.util.List; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/domain/DomainApplicationDeleteFlow.java b/java/google/registry/flows/domain/DomainApplicationDeleteFlow.java index 86a30186b..eda983605 100644 --- a/java/google/registry/flows/domain/DomainApplicationDeleteFlow.java +++ b/java/google/registry/flows/domain/DomainApplicationDeleteFlow.java @@ -20,7 +20,6 @@ import static google.registry.flows.domain.DomainFlowUtils.verifyLaunchApplicati import static google.registry.flows.domain.DomainFlowUtils.verifyLaunchPhase; import com.google.common.collect.ImmutableSet; - import google.registry.flows.EppException; import google.registry.flows.EppException.StatusProhibitsOperationException; import google.registry.flows.ResourceSyncDeleteFlow; @@ -33,9 +32,7 @@ import google.registry.model.eppcommon.StatusValue; import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.TldState; import google.registry.model.reporting.HistoryEntry; - import java.util.Set; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/domain/DomainApplicationInfoFlow.java b/java/google/registry/flows/domain/DomainApplicationInfoFlow.java index 50264b1e0..7c036280d 100644 --- a/java/google/registry/flows/domain/DomainApplicationInfoFlow.java +++ b/java/google/registry/flows/domain/DomainApplicationInfoFlow.java @@ -19,7 +19,6 @@ import static google.registry.flows.ResourceFlowUtils.verifyResourceOwnership; import static google.registry.flows.domain.DomainFlowUtils.verifyLaunchApplicationIdMatchesDomain; import com.google.common.collect.ImmutableList; - import google.registry.flows.EppException; import google.registry.flows.EppException.ParameterValuePolicyErrorException; import google.registry.flows.EppException.RequiredParameterMissingException; @@ -31,7 +30,6 @@ import google.registry.model.eppoutput.EppResponse.ResponseExtension; import google.registry.model.mark.Mark; import google.registry.model.smd.EncodedSignedMark; import google.registry.model.smd.SignedMark; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/domain/DomainApplicationUpdateFlow.java b/java/google/registry/flows/domain/DomainApplicationUpdateFlow.java index d0e4b0eb9..1cdc822e3 100644 --- a/java/google/registry/flows/domain/DomainApplicationUpdateFlow.java +++ b/java/google/registry/flows/domain/DomainApplicationUpdateFlow.java @@ -19,7 +19,6 @@ import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE; import static google.registry.flows.domain.DomainFlowUtils.DISALLOWED_TLD_STATES_FOR_LAUNCH_FLOWS; import com.google.common.collect.ImmutableSet; - import google.registry.flows.EppException; import google.registry.flows.EppException.StatusProhibitsOperationException; import google.registry.model.domain.DomainApplication; @@ -29,7 +28,6 @@ import google.registry.model.domain.launch.LaunchUpdateExtension; import google.registry.model.domain.secdns.SecDnsUpdateExtension; import google.registry.model.registry.Registry.TldState; import google.registry.model.reporting.HistoryEntry; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/domain/DomainCheckFlow.java b/java/google/registry/flows/domain/DomainCheckFlow.java index 597af6b4b..d6f7c8728 100644 --- a/java/google/registry/flows/domain/DomainCheckFlow.java +++ b/java/google/registry/flows/domain/DomainCheckFlow.java @@ -28,7 +28,6 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import com.google.common.net.InternetDomainName; - import google.registry.flows.EppException; import google.registry.flows.EppException.ParameterValuePolicyErrorException; import google.registry.model.domain.DomainApplication; @@ -44,9 +43,7 @@ import google.registry.model.eppoutput.EppResponse.ResponseExtension; import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.TldState; import google.registry.model.registry.label.ReservationType; - import java.util.Set; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/domain/DomainCreateFlow.java b/java/google/registry/flows/domain/DomainCreateFlow.java index a57d0abab..4ef2fca25 100644 --- a/java/google/registry/flows/domain/DomainCreateFlow.java +++ b/java/google/registry/flows/domain/DomainCreateFlow.java @@ -20,7 +20,6 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; - import google.registry.flows.EppException; import google.registry.flows.EppException.CommandUseErrorException; import google.registry.flows.EppException.StatusProhibitsOperationException; @@ -36,9 +35,7 @@ import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.TldState; import google.registry.model.reporting.HistoryEntry; import google.registry.tmch.LordnTask; - import java.util.Set; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/domain/DomainCreateOrAllocateFlow.java b/java/google/registry/flows/domain/DomainCreateOrAllocateFlow.java index 4cad400c7..890c083fa 100644 --- a/java/google/registry/flows/domain/DomainCreateOrAllocateFlow.java +++ b/java/google/registry/flows/domain/DomainCreateOrAllocateFlow.java @@ -20,9 +20,7 @@ import static google.registry.util.DateTimeUtils.leapSafeAddYears; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Ref; - import google.registry.dns.DnsQueue; import google.registry.flows.EppException; import google.registry.model.billing.BillingEvent; @@ -36,7 +34,6 @@ import google.registry.model.eppoutput.CreateData.DomainCreateData; import google.registry.model.eppoutput.EppOutput; import google.registry.model.eppoutput.Result; import google.registry.model.poll.PollMessage; - import org.joda.time.DateTime; /** An EPP flow that creates or allocates a new domain resource. */ diff --git a/java/google/registry/flows/domain/DomainDeleteFlow.java b/java/google/registry/flows/domain/DomainDeleteFlow.java index 96e7800ab..44dfee529 100644 --- a/java/google/registry/flows/domain/DomainDeleteFlow.java +++ b/java/google/registry/flows/domain/DomainDeleteFlow.java @@ -25,9 +25,7 @@ import static google.registry.util.CollectionUtils.nullToEmpty; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; - import google.registry.dns.DnsQueue; import google.registry.flows.EppException; import google.registry.flows.EppException.AssociationProhibitsOperationException; @@ -50,13 +48,11 @@ import google.registry.model.poll.PendingActionNotificationResponse.DomainPendin import google.registry.model.poll.PollMessage; import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; - +import javax.inject.Inject; import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.joda.time.DateTime; -import javax.inject.Inject; - /** * An EPP flow that deletes a domain resource. * diff --git a/java/google/registry/flows/domain/DomainFlowUtils.java b/java/google/registry/flows/domain/DomainFlowUtils.java index 1a82562f3..0fe9c0c94 100644 --- a/java/google/registry/flows/domain/DomainFlowUtils.java +++ b/java/google/registry/flows/domain/DomainFlowUtils.java @@ -39,10 +39,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.common.net.InternetDomainName; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.flows.EppException; import google.registry.flows.EppException.AuthorizationErrorException; import google.registry.flows.EppException.ObjectDoesNotExistException; @@ -92,11 +90,6 @@ import google.registry.pricing.TldSpecificLogicProxy; import google.registry.tmch.TmchXmlSignature; import google.registry.tmch.TmchXmlSignature.CertificateSignatureException; import google.registry.util.Idn; - -import org.joda.money.Money; -import org.joda.time.DateTime; -import org.xml.sax.SAXException; - import java.io.IOException; import java.math.BigDecimal; import java.security.GeneralSecurityException; @@ -108,10 +101,12 @@ import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Set; - import javax.xml.crypto.MarshalException; import javax.xml.crypto.dsig.XMLSignatureException; import javax.xml.parsers.ParserConfigurationException; +import org.joda.money.Money; +import org.joda.time.DateTime; +import org.xml.sax.SAXException; /** Static utility functions for domain flows. */ public class DomainFlowUtils { diff --git a/java/google/registry/flows/domain/DomainInfoFlow.java b/java/google/registry/flows/domain/DomainInfoFlow.java index 4d0696cc6..446bfea58 100644 --- a/java/google/registry/flows/domain/DomainInfoFlow.java +++ b/java/google/registry/flows/domain/DomainInfoFlow.java @@ -18,7 +18,6 @@ import static google.registry.flows.domain.DomainFlowUtils.handleFeeRequest; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import google.registry.flows.EppException; import google.registry.model.domain.DomainResource; import google.registry.model.domain.DomainResource.Builder; @@ -27,7 +26,6 @@ import google.registry.model.domain.fee.FeeInfoResponseExtension; import google.registry.model.domain.rgp.GracePeriodStatus; import google.registry.model.domain.rgp.RgpInfoExtension; import google.registry.model.eppoutput.EppResponse.ResponseExtension; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/domain/DomainRenewFlow.java b/java/google/registry/flows/domain/DomainRenewFlow.java index 8e4da5503..5398ad918 100644 --- a/java/google/registry/flows/domain/DomainRenewFlow.java +++ b/java/google/registry/flows/domain/DomainRenewFlow.java @@ -29,9 +29,7 @@ import static google.registry.util.DateTimeUtils.leapSafeAddYears; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Ref; - import google.registry.flows.EppException; import google.registry.flows.EppException.ObjectPendingTransferException; import google.registry.flows.EppException.ParameterValueRangeErrorException; @@ -53,14 +51,11 @@ import google.registry.model.poll.PollMessage; import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferStatus; - +import java.util.Set; +import javax.inject.Inject; import org.joda.money.Money; import org.joda.time.DateTime; -import java.util.Set; - -import javax.inject.Inject; - /** * An EPP flow that updates a domain resource. * diff --git a/java/google/registry/flows/domain/DomainRestoreRequestFlow.java b/java/google/registry/flows/domain/DomainRestoreRequestFlow.java index b3aa457cb..f8e94b41c 100644 --- a/java/google/registry/flows/domain/DomainRestoreRequestFlow.java +++ b/java/google/registry/flows/domain/DomainRestoreRequestFlow.java @@ -27,9 +27,7 @@ import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.collect.ImmutableList; import com.google.common.net.InternetDomainName; - import com.googlecode.objectify.Ref; - import google.registry.dns.DnsQueue; import google.registry.flows.EppException; import google.registry.flows.EppException.CommandUseErrorException; @@ -50,12 +48,10 @@ import google.registry.model.index.ForeignKeyIndex; import google.registry.model.poll.PollMessage; import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; - +import javax.inject.Inject; import org.joda.money.Money; import org.joda.time.DateTime; -import javax.inject.Inject; - /** * An EPP flow that requests that a deleted domain be restored. * diff --git a/java/google/registry/flows/domain/DomainTransferApproveFlow.java b/java/google/registry/flows/domain/DomainTransferApproveFlow.java index f6b4ccb31..ced04e84a 100644 --- a/java/google/registry/flows/domain/DomainTransferApproveFlow.java +++ b/java/google/registry/flows/domain/DomainTransferApproveFlow.java @@ -25,9 +25,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; - import com.googlecode.objectify.Ref; - import google.registry.flows.EppException; import google.registry.flows.ResourceTransferApproveFlow; import google.registry.model.billing.BillingEvent; @@ -42,10 +40,8 @@ import google.registry.model.poll.PollMessage; import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferData; - -import org.joda.time.DateTime; - import javax.inject.Inject; +import org.joda.time.DateTime; /** * An EPP flow that approves a pending transfer on a {@link DomainResource}. diff --git a/java/google/registry/flows/domain/DomainTransferCancelFlow.java b/java/google/registry/flows/domain/DomainTransferCancelFlow.java index c5253db0f..527ac926e 100644 --- a/java/google/registry/flows/domain/DomainTransferCancelFlow.java +++ b/java/google/registry/flows/domain/DomainTransferCancelFlow.java @@ -24,7 +24,6 @@ import google.registry.model.domain.DomainCommand.Transfer; import google.registry.model.domain.DomainResource; import google.registry.model.domain.DomainResource.Builder; import google.registry.model.reporting.HistoryEntry; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/domain/DomainTransferQueryFlow.java b/java/google/registry/flows/domain/DomainTransferQueryFlow.java index 209c333ed..c6586cc8f 100644 --- a/java/google/registry/flows/domain/DomainTransferQueryFlow.java +++ b/java/google/registry/flows/domain/DomainTransferQueryFlow.java @@ -17,7 +17,6 @@ package google.registry.flows.domain; import google.registry.flows.ResourceTransferQueryFlow; import google.registry.model.domain.DomainCommand.Transfer; import google.registry.model.domain.DomainResource; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/domain/DomainTransferRejectFlow.java b/java/google/registry/flows/domain/DomainTransferRejectFlow.java index ef90c07ca..780036ce2 100644 --- a/java/google/registry/flows/domain/DomainTransferRejectFlow.java +++ b/java/google/registry/flows/domain/DomainTransferRejectFlow.java @@ -24,7 +24,6 @@ import google.registry.model.domain.DomainCommand.Transfer; import google.registry.model.domain.DomainResource; import google.registry.model.domain.DomainResource.Builder; import google.registry.model.reporting.HistoryEntry; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/domain/DomainTransferRequestFlow.java b/java/google/registry/flows/domain/DomainTransferRequestFlow.java index 1538c23b0..3e1cd1127 100644 --- a/java/google/registry/flows/domain/DomainTransferRequestFlow.java +++ b/java/google/registry/flows/domain/DomainTransferRequestFlow.java @@ -27,10 +27,8 @@ import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.flows.EppException; import google.registry.flows.ResourceTransferRequestFlow; import google.registry.model.billing.BillingEvent; @@ -48,16 +46,13 @@ import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferData; import google.registry.model.transfer.TransferData.TransferServerApproveEntity; - +import java.util.HashSet; +import java.util.Set; +import javax.inject.Inject; import org.joda.money.Money; import org.joda.time.DateTime; import org.joda.time.Duration; -import java.util.HashSet; -import java.util.Set; - -import javax.inject.Inject; - /** * An EPP flow that requests a transfer on a {@link DomainResource}. * diff --git a/java/google/registry/flows/domain/DomainUpdateFlow.java b/java/google/registry/flows/domain/DomainUpdateFlow.java index b5cfff6e7..1efc2f66d 100644 --- a/java/google/registry/flows/domain/DomainUpdateFlow.java +++ b/java/google/registry/flows/domain/DomainUpdateFlow.java @@ -21,7 +21,6 @@ import static google.registry.util.DateTimeUtils.earliestOf; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; - import google.registry.dns.DnsQueue; import google.registry.model.billing.BillingEvent; import google.registry.model.billing.BillingEvent.Reason; @@ -33,12 +32,9 @@ import google.registry.model.domain.secdns.SecDnsUpdateExtension; import google.registry.model.eppcommon.StatusValue; import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; - -import org.joda.time.DateTime; - import java.util.Set; - import javax.inject.Inject; +import org.joda.time.DateTime; /** * An EPP flow that updates a domain resource. diff --git a/java/google/registry/flows/host/HostCheckFlow.java b/java/google/registry/flows/host/HostCheckFlow.java index 356e0063a..9fbdfed73 100644 --- a/java/google/registry/flows/host/HostCheckFlow.java +++ b/java/google/registry/flows/host/HostCheckFlow.java @@ -17,16 +17,13 @@ package google.registry.flows.host; import static google.registry.model.EppResourceUtils.checkResourcesExist; import com.google.common.collect.ImmutableList; - import google.registry.flows.ResourceCheckFlow; import google.registry.model.eppoutput.CheckData; import google.registry.model.eppoutput.CheckData.HostCheck; import google.registry.model.eppoutput.CheckData.HostCheckData; import google.registry.model.host.HostCommand.Check; import google.registry.model.host.HostResource; - import java.util.Set; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/host/HostCreateFlow.java b/java/google/registry/flows/host/HostCreateFlow.java index 2d0d0d8a0..97c9e19d5 100644 --- a/java/google/registry/flows/host/HostCreateFlow.java +++ b/java/google/registry/flows/host/HostCreateFlow.java @@ -23,9 +23,7 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.util.CollectionUtils.isNullOrEmpty; import com.google.common.base.Optional; - import com.googlecode.objectify.Ref; - import google.registry.dns.DnsQueue; import google.registry.flows.EppException; import google.registry.flows.EppException.ParameterValueRangeErrorException; @@ -39,7 +37,6 @@ import google.registry.model.host.HostResource; import google.registry.model.host.HostResource.Builder; import google.registry.model.ofy.ObjectifyService; import google.registry.model.reporting.HistoryEntry; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/host/HostDeleteFlow.java b/java/google/registry/flows/host/HostDeleteFlow.java index 138bbc2bc..9f6b12276 100644 --- a/java/google/registry/flows/host/HostDeleteFlow.java +++ b/java/google/registry/flows/host/HostDeleteFlow.java @@ -20,10 +20,8 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.config.RegistryEnvironment; import google.registry.flows.EppException; import google.registry.flows.ResourceAsyncDeleteFlow; @@ -35,7 +33,6 @@ import google.registry.model.host.HostCommand.Delete; import google.registry.model.host.HostResource; import google.registry.model.host.HostResource.Builder; import google.registry.model.reporting.HistoryEntry; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/host/HostFlowUtils.java b/java/google/registry/flows/host/HostFlowUtils.java index 0b6b13dbc..b22c2259f 100644 --- a/java/google/registry/flows/host/HostFlowUtils.java +++ b/java/google/registry/flows/host/HostFlowUtils.java @@ -22,9 +22,7 @@ import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.collect.Iterables; import com.google.common.net.InternetDomainName; - import com.googlecode.objectify.Ref; - import google.registry.flows.EppException; import google.registry.flows.EppException.AuthorizationErrorException; import google.registry.flows.EppException.ObjectDoesNotExistException; @@ -32,7 +30,6 @@ import google.registry.flows.EppException.ParameterValuePolicyErrorException; import google.registry.flows.EppException.ParameterValueRangeErrorException; import google.registry.flows.EppException.ParameterValueSyntaxErrorException; import google.registry.model.domain.DomainResource; - import org.joda.time.DateTime; /** Static utility functions for host flows. */ diff --git a/java/google/registry/flows/host/HostInfoFlow.java b/java/google/registry/flows/host/HostInfoFlow.java index 67ff20dd8..09aa33ad4 100644 --- a/java/google/registry/flows/host/HostInfoFlow.java +++ b/java/google/registry/flows/host/HostInfoFlow.java @@ -17,7 +17,6 @@ package google.registry.flows.host; import google.registry.flows.ResourceInfoFlow; import google.registry.model.host.HostCommand; import google.registry.model.host.HostResource; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/host/HostUpdateFlow.java b/java/google/registry/flows/host/HostUpdateFlow.java index f10c8a4eb..69d7edd77 100644 --- a/java/google/registry/flows/host/HostUpdateFlow.java +++ b/java/google/registry/flows/host/HostUpdateFlow.java @@ -23,10 +23,8 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.util.CollectionUtils.isNullOrEmpty; import com.google.common.collect.ImmutableMap; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.dns.DnsQueue; import google.registry.flows.EppException; import google.registry.flows.EppException.ObjectAlreadyExistsException; @@ -42,12 +40,9 @@ import google.registry.model.host.HostResource; import google.registry.model.host.HostResource.Builder; import google.registry.model.index.ForeignKeyIndex; import google.registry.model.reporting.HistoryEntry; - -import org.joda.time.Duration; - import java.util.Objects; - import javax.inject.Inject; +import org.joda.time.Duration; /** * An EPP flow that updates a host resource. diff --git a/java/google/registry/flows/picker/FlowPicker.java b/java/google/registry/flows/picker/FlowPicker.java index 5b735fd54..0762c5f8e 100644 --- a/java/google/registry/flows/picker/FlowPicker.java +++ b/java/google/registry/flows/picker/FlowPicker.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableTable; import com.google.common.collect.Table; - import google.registry.flows.EppException; import google.registry.flows.EppException.SyntaxErrorException; import google.registry.flows.EppException.UnimplementedCommandException; @@ -85,7 +84,6 @@ import google.registry.model.eppinput.EppInput.Transfer; import google.registry.model.eppinput.EppInput.Transfer.TransferOp; import google.registry.model.eppinput.ResourceCommand; import google.registry.model.host.HostCommand; - import java.util.Map; import java.util.Set; diff --git a/java/google/registry/flows/poll/PollAckFlow.java b/java/google/registry/flows/poll/PollAckFlow.java index 78523d221..da2649550 100644 --- a/java/google/registry/flows/poll/PollAckFlow.java +++ b/java/google/registry/flows/poll/PollAckFlow.java @@ -21,7 +21,6 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.util.DateTimeUtils.isBeforeOrAt; import com.googlecode.objectify.Key; - import google.registry.flows.EppException; import google.registry.flows.EppException.AuthorizationErrorException; import google.registry.flows.EppException.ObjectDoesNotExistException; @@ -32,10 +31,8 @@ import google.registry.model.eppoutput.EppOutput; import google.registry.model.poll.MessageQueueInfo; import google.registry.model.poll.PollMessage; import google.registry.model.poll.PollMessageExternalKeyConverter.PollMessageExternalKeyParseException; - -import org.joda.time.DateTime; - import javax.inject.Inject; +import org.joda.time.DateTime; /** * An EPP flow for acknowledging poll messages. diff --git a/java/google/registry/flows/poll/PollFlow.java b/java/google/registry/flows/poll/PollFlow.java index a2e22d9a5..bbb731f25 100644 --- a/java/google/registry/flows/poll/PollFlow.java +++ b/java/google/registry/flows/poll/PollFlow.java @@ -17,11 +17,9 @@ package google.registry.flows.poll; import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.collect.ImmutableList; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Work; import com.googlecode.objectify.cmd.Query; - import google.registry.flows.EppException; import google.registry.flows.LoggedInFlow; import google.registry.model.eppinput.EppInput.Poll; @@ -32,7 +30,6 @@ import google.registry.model.eppoutput.EppResponse.ResponseExtension; import google.registry.model.eppoutput.Result; import google.registry.model.poll.MessageQueueInfo; import google.registry.model.poll.PollMessage; - import java.util.List; /** Base class of EPP Poll command flows. Mostly provides datastore helper methods. */ diff --git a/java/google/registry/flows/poll/PollRequestFlow.java b/java/google/registry/flows/poll/PollRequestFlow.java index 87727f607..f479556af 100644 --- a/java/google/registry/flows/poll/PollRequestFlow.java +++ b/java/google/registry/flows/poll/PollRequestFlow.java @@ -20,15 +20,12 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.util.CollectionUtils.forceEmptyToNull; import com.googlecode.objectify.Key; - import google.registry.flows.EppException; import google.registry.flows.EppException.ParameterValueSyntaxErrorException; import google.registry.model.eppoutput.EppOutput; import google.registry.model.poll.MessageQueueInfo; import google.registry.model.poll.PollMessage; - import java.util.List; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/session/HelloFlow.java b/java/google/registry/flows/session/HelloFlow.java index 6cb0efd47..3ade00d18 100644 --- a/java/google/registry/flows/session/HelloFlow.java +++ b/java/google/registry/flows/session/HelloFlow.java @@ -17,7 +17,6 @@ package google.registry.flows.session; import google.registry.flows.Flow; import google.registry.model.eppoutput.EppOutput; import google.registry.model.eppoutput.Greeting; - import javax.inject.Inject; /** A flow for an Epp "hello". */ diff --git a/java/google/registry/flows/session/LoginFlow.java b/java/google/registry/flows/session/LoginFlow.java index 66b6c4916..10c991f25 100644 --- a/java/google/registry/flows/session/LoginFlow.java +++ b/java/google/registry/flows/session/LoginFlow.java @@ -18,7 +18,6 @@ import static com.google.common.collect.Sets.difference; import static google.registry.util.CollectionUtils.nullToEmpty; import com.google.common.collect.ImmutableSet; - import google.registry.flows.EppException; import google.registry.flows.EppException.AuthenticationErrorClosingConnectionException; import google.registry.flows.EppException.AuthenticationErrorException; @@ -38,9 +37,7 @@ import google.registry.model.eppoutput.EppOutput; import google.registry.model.eppoutput.Result.Code; import google.registry.model.registrar.Registrar; import google.registry.util.FormattingLogger; - import java.util.Set; - import javax.inject.Inject; /** diff --git a/java/google/registry/flows/session/LogoutFlow.java b/java/google/registry/flows/session/LogoutFlow.java index bd8646c9d..aad1d3455 100644 --- a/java/google/registry/flows/session/LogoutFlow.java +++ b/java/google/registry/flows/session/LogoutFlow.java @@ -19,7 +19,6 @@ import static google.registry.model.eppoutput.Result.Code.SuccessAndClose; import google.registry.flows.EppException; import google.registry.flows.LoggedInFlow; import google.registry.model.eppoutput.EppOutput; - import javax.inject.Inject; /** diff --git a/java/google/registry/gcs/GcsServiceModule.java b/java/google/registry/gcs/GcsServiceModule.java index e7ebc9deb..efa93aa49 100644 --- a/java/google/registry/gcs/GcsServiceModule.java +++ b/java/google/registry/gcs/GcsServiceModule.java @@ -17,7 +17,6 @@ package google.registry.gcs; import com.google.appengine.tools.cloudstorage.GcsService; import com.google.appengine.tools.cloudstorage.GcsServiceFactory; import com.google.appengine.tools.cloudstorage.RetryParams; - import dagger.Module; import dagger.Provides; diff --git a/java/google/registry/gcs/GcsUtils.java b/java/google/registry/gcs/GcsUtils.java index 9c5271913..554413ebb 100644 --- a/java/google/registry/gcs/GcsUtils.java +++ b/java/google/registry/gcs/GcsUtils.java @@ -24,16 +24,13 @@ import com.google.appengine.tools.cloudstorage.GcsService; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; - import google.registry.config.ConfigModule.Config; import google.registry.util.FormattingLogger; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.nio.ByteBuffer; import java.nio.channels.Channels; - import javax.annotation.CheckReturnValue; import javax.inject.Inject; diff --git a/java/google/registry/groups/DirectoryGroupsConnection.java b/java/google/registry/groups/DirectoryGroupsConnection.java index 5141b1446..3b64fa47e 100644 --- a/java/google/registry/groups/DirectoryGroupsConnection.java +++ b/java/google/registry/groups/DirectoryGroupsConnection.java @@ -29,13 +29,10 @@ import com.google.api.services.groupssettings.model.Groups; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; - import google.registry.config.ConfigModule.Config; import google.registry.util.FormattingLogger; - import java.io.IOException; import java.util.Set; - import javax.inject.Inject; /** diff --git a/java/google/registry/groups/DirectoryModule.java b/java/google/registry/groups/DirectoryModule.java index a25a6cb0a..f53ae93af 100644 --- a/java/google/registry/groups/DirectoryModule.java +++ b/java/google/registry/groups/DirectoryModule.java @@ -18,16 +18,12 @@ import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; import com.google.api.services.admin.directory.Directory; import com.google.api.services.admin.directory.DirectoryScopes; import com.google.common.collect.ImmutableSet; - import dagger.Module; import dagger.Provides; import dagger.multibindings.ElementsIntoSet; - import google.registry.config.ConfigModule.Config; import google.registry.request.DelegatedOAuthScopes; - import java.util.Set; - import javax.inject.Named; /** diff --git a/java/google/registry/groups/GroupsConnection.java b/java/google/registry/groups/GroupsConnection.java index 8354ab861..a39d65c05 100644 --- a/java/google/registry/groups/GroupsConnection.java +++ b/java/google/registry/groups/GroupsConnection.java @@ -16,7 +16,6 @@ package google.registry.groups; import com.google.api.client.googleapis.json.GoogleJsonResponseException; import com.google.api.services.admin.directory.model.Group; - import java.io.IOException; import java.util.Set; diff --git a/java/google/registry/groups/GroupssettingsModule.java b/java/google/registry/groups/GroupssettingsModule.java index 215c8116b..38c12ed3f 100644 --- a/java/google/registry/groups/GroupssettingsModule.java +++ b/java/google/registry/groups/GroupssettingsModule.java @@ -18,16 +18,12 @@ import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; import com.google.api.services.groupssettings.Groupssettings; import com.google.api.services.groupssettings.GroupssettingsScopes; import com.google.common.collect.ImmutableSet; - import dagger.Module; import dagger.Provides; import dagger.multibindings.ElementsIntoSet; - import google.registry.config.ConfigModule.Config; import google.registry.request.DelegatedOAuthScopes; - import java.util.Set; - import javax.inject.Named; /** diff --git a/java/google/registry/keyring/api/KeyModule.java b/java/google/registry/keyring/api/KeyModule.java index d1b271a32..79539d554 100644 --- a/java/google/registry/keyring/api/KeyModule.java +++ b/java/google/registry/keyring/api/KeyModule.java @@ -17,18 +17,14 @@ package google.registry.keyring.api; import static com.google.common.base.Strings.emptyToNull; import com.google.common.base.Optional; - import dagger.Module; import dagger.Provides; - +import java.lang.annotation.Documented; +import javax.inject.Qualifier; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPrivateKey; import org.bouncycastle.openpgp.PGPPublicKey; -import java.lang.annotation.Documented; - -import javax.inject.Qualifier; - /** Dagger module for keys stored in {@link Keyring}. */ @Module public final class KeyModule { diff --git a/java/google/registry/keyring/api/Keyring.java b/java/google/registry/keyring/api/Keyring.java index 695f7c188..feb9d76ca 100644 --- a/java/google/registry/keyring/api/Keyring.java +++ b/java/google/registry/keyring/api/Keyring.java @@ -14,12 +14,11 @@ package google.registry.keyring.api; +import javax.annotation.concurrent.ThreadSafe; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPrivateKey; import org.bouncycastle.openpgp.PGPPublicKey; -import javax.annotation.concurrent.ThreadSafe; - /** * Domain Registry keyring interface. * diff --git a/java/google/registry/keyring/api/PgpHelper.java b/java/google/registry/keyring/api/PgpHelper.java index 5a3330ab7..e74b1ee5f 100644 --- a/java/google/registry/keyring/api/PgpHelper.java +++ b/java/google/registry/keyring/api/PgpHelper.java @@ -24,7 +24,8 @@ import static org.bouncycastle.bcpg.PublicKeyAlgorithmTags.RSA_SIGN; import com.google.common.base.Optional; import com.google.common.base.VerifyException; - +import java.io.IOException; +import java.util.Iterator; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPrivateKey; @@ -37,9 +38,6 @@ import org.bouncycastle.openpgp.bc.BcPGPPublicKeyRing; import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; -import java.io.IOException; -import java.util.Iterator; - /** Helper functions for extracting PGP keys from their keyrings. */ public final class PgpHelper { diff --git a/java/google/registry/keyring/api/VoidKeyring.java b/java/google/registry/keyring/api/VoidKeyring.java index e7940febe..0ea143fa1 100644 --- a/java/google/registry/keyring/api/VoidKeyring.java +++ b/java/google/registry/keyring/api/VoidKeyring.java @@ -14,12 +14,11 @@ package google.registry.keyring.api; +import javax.annotation.concurrent.Immutable; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPrivateKey; import org.bouncycastle.openpgp.PGPPublicKey; -import javax.annotation.concurrent.Immutable; - /** {@link Keyring} that throws {@link UnsupportedOperationException} if any methods are called. */ @Immutable public final class VoidKeyring implements Keyring { diff --git a/java/google/registry/keyring/api/VoidKeyringModule.java b/java/google/registry/keyring/api/VoidKeyringModule.java index a0b4d357b..fc1b32eb3 100644 --- a/java/google/registry/keyring/api/VoidKeyringModule.java +++ b/java/google/registry/keyring/api/VoidKeyringModule.java @@ -16,7 +16,6 @@ package google.registry.keyring.api; import dagger.Module; import dagger.Provides; - import javax.annotation.concurrent.Immutable; /** Dagger keyring module that always returns {@link VoidKeyring} instances. */ diff --git a/java/google/registry/loadtest/LoadTestAction.java b/java/google/registry/loadtest/LoadTestAction.java index 5fcb835cf..0928bc31d 100644 --- a/java/google/registry/loadtest/LoadTestAction.java +++ b/java/google/registry/loadtest/LoadTestAction.java @@ -32,22 +32,18 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterators; import com.google.common.net.MediaType; - import google.registry.config.RegistryEnvironment; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.util.TaskEnqueuer; - -import org.joda.time.DateTime; - import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Random; - import javax.inject.Inject; +import org.joda.time.DateTime; /** Simple load test action that can generate configurable QPSes of various EPP actions. */ @Action( diff --git a/java/google/registry/loadtest/LoadTestModule.java b/java/google/registry/loadtest/LoadTestModule.java index 50048705e..ec3889236 100644 --- a/java/google/registry/loadtest/LoadTestModule.java +++ b/java/google/registry/loadtest/LoadTestModule.java @@ -19,12 +19,9 @@ import static google.registry.request.RequestParameters.extractRequiredParameter import dagger.Module; import dagger.Provides; - import google.registry.request.Parameter; - -import org.joda.time.Minutes; - import javax.servlet.http.HttpServletRequest; +import org.joda.time.Minutes; /** * Dagger module for loadtest package. diff --git a/java/google/registry/mapreduce/MapreduceModule.java b/java/google/registry/mapreduce/MapreduceModule.java index 61f060d96..829d8d76b 100644 --- a/java/google/registry/mapreduce/MapreduceModule.java +++ b/java/google/registry/mapreduce/MapreduceModule.java @@ -21,12 +21,9 @@ import static google.registry.request.RequestParameters.extractBooleanParameter; import static google.registry.request.RequestParameters.extractOptionalIntParameter; import com.google.common.base.Optional; - import dagger.Module; import dagger.Provides; - import google.registry.request.Parameter; - import javax.servlet.http.HttpServletRequest; /** Dagger module for the mapreduce package. */ diff --git a/java/google/registry/mapreduce/MapreduceRunner.java b/java/google/registry/mapreduce/MapreduceRunner.java index 06ab73816..ea387c098 100644 --- a/java/google/registry/mapreduce/MapreduceRunner.java +++ b/java/google/registry/mapreduce/MapreduceRunner.java @@ -34,17 +34,13 @@ import com.google.appengine.tools.pipeline.Job0; import com.google.appengine.tools.pipeline.JobSetting; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; - import google.registry.mapreduce.inputs.ConcatenatingInput; import google.registry.request.Parameter; import google.registry.util.FormattingLogger; import google.registry.util.PipelineUtils; - -import org.joda.time.Duration; - import java.io.Serializable; - import javax.inject.Inject; +import org.joda.time.Duration; /** * Runner for map-only or full map and reduce mapreduces. diff --git a/java/google/registry/mapreduce/inputs/ChildEntityInput.java b/java/google/registry/mapreduce/inputs/ChildEntityInput.java index 8f0e11303..fe8947b60 100644 --- a/java/google/registry/mapreduce/inputs/ChildEntityInput.java +++ b/java/google/registry/mapreduce/inputs/ChildEntityInput.java @@ -19,9 +19,7 @@ import static google.registry.util.TypeUtils.checkNoInheritanceRelationships; import com.google.appengine.tools.mapreduce.Input; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; - import google.registry.model.EppResource; import google.registry.model.ImmutableObject; import google.registry.model.index.EppResourceIndexBucket; diff --git a/java/google/registry/mapreduce/inputs/ChildEntityReader.java b/java/google/registry/mapreduce/inputs/ChildEntityReader.java index f4bb18cb7..b80c678b3 100644 --- a/java/google/registry/mapreduce/inputs/ChildEntityReader.java +++ b/java/google/registry/mapreduce/inputs/ChildEntityReader.java @@ -23,17 +23,14 @@ import com.google.appengine.tools.mapreduce.InputReader; import com.google.appengine.tools.mapreduce.ShardContext; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.cmd.Query; - import google.registry.model.EppResource; import google.registry.model.ImmutableObject; import google.registry.model.index.EppResourceIndex; import google.registry.model.index.EppResourceIndexBucket; import google.registry.util.FormattingLogger; - import java.io.IOException; import java.util.NoSuchElementException; diff --git a/java/google/registry/mapreduce/inputs/ChunkingKeyInput.java b/java/google/registry/mapreduce/inputs/ChunkingKeyInput.java index 302d19e6c..90e2e5070 100644 --- a/java/google/registry/mapreduce/inputs/ChunkingKeyInput.java +++ b/java/google/registry/mapreduce/inputs/ChunkingKeyInput.java @@ -18,7 +18,6 @@ import com.google.appengine.api.datastore.Key; import com.google.appengine.tools.mapreduce.Input; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.ImmutableList; - import java.io.IOException; import java.util.List; import java.util.NoSuchElementException; diff --git a/java/google/registry/mapreduce/inputs/ConcatenatingInput.java b/java/google/registry/mapreduce/inputs/ConcatenatingInput.java index 25149780a..1df132f39 100644 --- a/java/google/registry/mapreduce/inputs/ConcatenatingInput.java +++ b/java/google/registry/mapreduce/inputs/ConcatenatingInput.java @@ -21,7 +21,6 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ListMultimap; - import java.io.IOException; import java.util.Collection; import java.util.List; diff --git a/java/google/registry/mapreduce/inputs/EppResourceBaseInput.java b/java/google/registry/mapreduce/inputs/EppResourceBaseInput.java index 5833cbdd7..d7d04844d 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceBaseInput.java +++ b/java/google/registry/mapreduce/inputs/EppResourceBaseInput.java @@ -17,12 +17,9 @@ package google.registry.mapreduce.inputs; import com.google.appengine.tools.mapreduce.Input; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.ImmutableList; - import com.googlecode.objectify.Key; - import google.registry.model.index.EppResourceIndex; import google.registry.model.index.EppResourceIndexBucket; - import java.util.List; /** Base class for {@link Input} classes that map over {@link EppResourceIndex}. */ diff --git a/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java b/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java index eada5a78b..31e12e34a 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java +++ b/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java @@ -22,15 +22,12 @@ import com.google.appengine.api.datastore.QueryResultIterator; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.cmd.Query; - import google.registry.model.EppResource; import google.registry.model.index.EppResourceIndex; import google.registry.model.index.EppResourceIndexBucket; import google.registry.util.FormattingLogger; - import java.util.NoSuchElementException; /** Base class for {@link InputReader} classes that map over {@link EppResourceIndex}. */ diff --git a/java/google/registry/mapreduce/inputs/EppResourceEntityInput.java b/java/google/registry/mapreduce/inputs/EppResourceEntityInput.java index f7ca87548..866bdfc43 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceEntityInput.java +++ b/java/google/registry/mapreduce/inputs/EppResourceEntityInput.java @@ -19,9 +19,7 @@ import static google.registry.util.TypeUtils.checkNoInheritanceRelationships; import com.google.appengine.tools.mapreduce.Input; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; - import google.registry.model.EppResource; import google.registry.model.index.EppResourceIndexBucket; diff --git a/java/google/registry/mapreduce/inputs/EppResourceEntityReader.java b/java/google/registry/mapreduce/inputs/EppResourceEntityReader.java index 26091b1b8..407e8cc1a 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceEntityReader.java +++ b/java/google/registry/mapreduce/inputs/EppResourceEntityReader.java @@ -16,14 +16,11 @@ package google.registry.mapreduce.inputs; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.model.EppResource; import google.registry.model.index.EppResourceIndex; import google.registry.model.index.EppResourceIndexBucket; - import java.util.NoSuchElementException; /** Reader that maps over {@link EppResourceIndex} and returns resources. */ diff --git a/java/google/registry/mapreduce/inputs/EppResourceIndexInput.java b/java/google/registry/mapreduce/inputs/EppResourceIndexInput.java index 7b6a6ded8..05dbaed43 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceIndexInput.java +++ b/java/google/registry/mapreduce/inputs/EppResourceIndexInput.java @@ -16,9 +16,7 @@ package google.registry.mapreduce.inputs; import com.google.appengine.tools.mapreduce.Input; import com.google.appengine.tools.mapreduce.InputReader; - import com.googlecode.objectify.Key; - import google.registry.model.index.EppResourceIndex; import google.registry.model.index.EppResourceIndexBucket; diff --git a/java/google/registry/mapreduce/inputs/EppResourceIndexReader.java b/java/google/registry/mapreduce/inputs/EppResourceIndexReader.java index 05d7f1638..c3504df44 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceIndexReader.java +++ b/java/google/registry/mapreduce/inputs/EppResourceIndexReader.java @@ -16,12 +16,9 @@ package google.registry.mapreduce.inputs; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; - import google.registry.model.index.EppResourceIndex; import google.registry.model.index.EppResourceIndexBucket; - import java.util.NoSuchElementException; /** Reader that maps over {@link EppResourceIndex} and returns the index objects themselves. */ diff --git a/java/google/registry/mapreduce/inputs/EppResourceInputs.java b/java/google/registry/mapreduce/inputs/EppResourceInputs.java index cb3c8ff1a..0945b146a 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceInputs.java +++ b/java/google/registry/mapreduce/inputs/EppResourceInputs.java @@ -22,10 +22,8 @@ import static google.registry.util.TypeUtils.hasAnnotation; import com.google.appengine.tools.mapreduce.Input; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.EntitySubclass; - import google.registry.model.EppResource; import google.registry.model.ImmutableObject; import google.registry.model.index.EppResourceIndex; diff --git a/java/google/registry/mapreduce/inputs/EppResourceKeyInput.java b/java/google/registry/mapreduce/inputs/EppResourceKeyInput.java index e829a9c43..5650fab53 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceKeyInput.java +++ b/java/google/registry/mapreduce/inputs/EppResourceKeyInput.java @@ -19,9 +19,7 @@ import static google.registry.util.TypeUtils.checkNoInheritanceRelationships; import com.google.appengine.tools.mapreduce.Input; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; - import google.registry.model.EppResource; import google.registry.model.index.EppResourceIndexBucket; diff --git a/java/google/registry/mapreduce/inputs/EppResourceKeyReader.java b/java/google/registry/mapreduce/inputs/EppResourceKeyReader.java index 1f1ecc2db..48910a971 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceKeyReader.java +++ b/java/google/registry/mapreduce/inputs/EppResourceKeyReader.java @@ -16,13 +16,10 @@ package google.registry.mapreduce.inputs; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; - import google.registry.model.EppResource; import google.registry.model.index.EppResourceIndex; import google.registry.model.index.EppResourceIndexBucket; - import java.util.NoSuchElementException; /** diff --git a/java/google/registry/mapreduce/inputs/NullInput.java b/java/google/registry/mapreduce/inputs/NullInput.java index 03e8cfd92..d6ed15efc 100644 --- a/java/google/registry/mapreduce/inputs/NullInput.java +++ b/java/google/registry/mapreduce/inputs/NullInput.java @@ -17,7 +17,6 @@ package google.registry.mapreduce.inputs; import com.google.appengine.tools.mapreduce.Input; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.ImmutableList; - import java.util.List; import java.util.NoSuchElementException; diff --git a/java/google/registry/model/Buildable.java b/java/google/registry/model/Buildable.java index 90c814e50..c5d1f0dec 100644 --- a/java/google/registry/model/Buildable.java +++ b/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. */ diff --git a/java/google/registry/model/CreateAutoTimestamp.java b/java/google/registry/model/CreateAutoTimestamp.java index bb4b10c03..71e40817b 100644 --- a/java/google/registry/model/CreateAutoTimestamp.java +++ b/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; /** diff --git a/java/google/registry/model/EntityClasses.java b/java/google/registry/model/EntityClasses.java index 896ddc2cd..36f63de5f 100644 --- a/java/google/registry/model/EntityClasses.java +++ b/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; diff --git a/java/google/registry/model/EppResource.java b/java/google/registry/model/EppResource.java index 69c0eb5af..78ae0d14d 100644 --- a/java/google/registry/model/EppResource.java +++ b/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 diff --git a/java/google/registry/model/EppResourceUtils.java b/java/google/registry/model/EppResourceUtils.java index daf8b70a2..9276446cc 100644 --- a/java/google/registry/model/EppResourceUtils.java +++ b/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 { diff --git a/java/google/registry/model/ImmutableObject.java b/java/google/registry/model/ImmutableObject.java index ebb51f27b..849f4ae05 100644 --- a/java/google/registry/model/ImmutableObject.java +++ b/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; diff --git a/java/google/registry/model/JsonMapBuilder.java b/java/google/registry/model/JsonMapBuilder.java index b91926e2a..7c8676a0b 100644 --- a/java/google/registry/model/JsonMapBuilder.java +++ b/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; /** diff --git a/java/google/registry/model/ModelUtils.java b/java/google/registry/model/ModelUtils.java index 3926eb570..1694dfbc2 100644 --- a/java/google/registry/model/ModelUtils.java +++ b/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; diff --git a/java/google/registry/model/RoidSuffixes.java b/java/google/registry/model/RoidSuffixes.java index 38795ade2..c7b23af74 100644 --- a/java/google/registry/model/RoidSuffixes.java +++ b/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. */ diff --git a/java/google/registry/model/SchemaVersion.java b/java/google/registry/model/SchemaVersion.java index a6d90e33c..53ddc20ab 100644 --- a/java/google/registry/model/SchemaVersion.java +++ b/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; diff --git a/java/google/registry/model/UpdateAutoTimestamp.java b/java/google/registry/model/UpdateAutoTimestamp.java index feedae152..ce562ec95 100644 --- a/java/google/registry/model/UpdateAutoTimestamp.java +++ b/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; /** diff --git a/java/google/registry/model/annotations/NotBackedUp.java b/java/google/registry/model/annotations/NotBackedUp.java index a437ba328..a24735b9f 100644 --- a/java/google/registry/model/annotations/NotBackedUp.java +++ b/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; diff --git a/java/google/registry/model/annotations/VirtualEntity.java b/java/google/registry/model/annotations/VirtualEntity.java index d5f12dd23..900deef15 100644 --- a/java/google/registry/model/annotations/VirtualEntity.java +++ b/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; diff --git a/java/google/registry/model/billing/BillingEvent.java b/java/google/registry/model/billing/BillingEvent.java index ffe88765b..bb40af992 100644 --- a/java/google/registry/model/billing/BillingEvent.java +++ b/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 diff --git a/java/google/registry/model/billing/RegistrarBillingEntry.java b/java/google/registry/model/billing/RegistrarBillingEntry.java index 3c9fd8b22..1373a6184 100644 --- a/java/google/registry/model/billing/RegistrarBillingEntry.java +++ b/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. * diff --git a/java/google/registry/model/billing/RegistrarBillingUtils.java b/java/google/registry/model/billing/RegistrarBillingUtils.java index d5ee459f4..4e8fe70aa 100644 --- a/java/google/registry/model/billing/RegistrarBillingUtils.java +++ b/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 { diff --git a/java/google/registry/model/billing/RegistrarCredit.java b/java/google/registry/model/billing/RegistrarCredit.java index 61ee94d3a..dfc516fc1 100644 --- a/java/google/registry/model/billing/RegistrarCredit.java +++ b/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; diff --git a/java/google/registry/model/billing/RegistrarCreditBalance.java b/java/google/registry/model/billing/RegistrarCreditBalance.java index 5436a3f13..8d009a4fa 100644 --- a/java/google/registry/model/billing/RegistrarCreditBalance.java +++ b/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. diff --git a/java/google/registry/model/common/CrossTldSingleton.java b/java/google/registry/model/common/CrossTldSingleton.java index 000a71212..9d0cb81eb 100644 --- a/java/google/registry/model/common/CrossTldSingleton.java +++ b/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. */ diff --git a/java/google/registry/model/common/Cursor.java b/java/google/registry/model/common/Cursor.java index 6c542d205..f797a54bd 100644 --- a/java/google/registry/model/common/Cursor.java +++ b/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; /** diff --git a/java/google/registry/model/common/EntityGroupRoot.java b/java/google/registry/model/common/EntityGroupRoot.java index e48d66b16..b38d39046 100644 --- a/java/google/registry/model/common/EntityGroupRoot.java +++ b/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; /** diff --git a/java/google/registry/model/common/GaeUserIdConverter.java b/java/google/registry/model/common/GaeUserIdConverter.java index 524da0bd9..208e1e767 100644 --- a/java/google/registry/model/common/GaeUserIdConverter.java +++ b/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; diff --git a/java/google/registry/model/common/PersistedRangeLong.java b/java/google/registry/model/common/PersistedRangeLong.java index 5c008d2d5..e3fd8a0c0 100644 --- a/java/google/registry/model/common/PersistedRangeLong.java +++ b/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} that can be persisted to datastore. */ diff --git a/java/google/registry/model/common/TimeOfYear.java b/java/google/registry/model/common/TimeOfYear.java index c49709cd2..53895e83c 100644 --- a/java/google/registry/model/common/TimeOfYear.java +++ b/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. diff --git a/java/google/registry/model/common/TimedTransitionProperty.java b/java/google/registry/model/common/TimedTransitionProperty.java index e261f1e9a..ff5681719 100644 --- a/java/google/registry/model/common/TimedTransitionProperty.java +++ b/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 diff --git a/java/google/registry/model/contact/ContactAddress.java b/java/google/registry/model/contact/ContactAddress.java index 41e600cca..0ab8a23f0 100644 --- a/java/google/registry/model/contact/ContactAddress.java +++ b/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; /** diff --git a/java/google/registry/model/contact/ContactAuthInfo.java b/java/google/registry/model/contact/ContactAuthInfo.java index 6c587dbd1..3819eff88 100644 --- a/java/google/registry/model/contact/ContactAuthInfo.java +++ b/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. */ diff --git a/java/google/registry/model/contact/ContactCommand.java b/java/google/registry/model/contact/ContactCommand.java index b33c5a51e..9b1612974 100644 --- a/java/google/registry/model/contact/ContactCommand.java +++ b/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; diff --git a/java/google/registry/model/contact/ContactPhoneNumber.java b/java/google/registry/model/contact/ContactPhoneNumber.java index abee7564d..cc2387241 100644 --- a/java/google/registry/model/contact/ContactPhoneNumber.java +++ b/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; /** diff --git a/java/google/registry/model/contact/ContactResource.java b/java/google/registry/model/contact/ContactResource.java index 94653ebe1..4bfa551ac 100644 --- a/java/google/registry/model/contact/ContactResource.java +++ b/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") diff --git a/java/google/registry/model/contact/Disclose.java b/java/google/registry/model/contact/Disclose.java index 32bb8a966..7beda449e 100644 --- a/java/google/registry/model/contact/Disclose.java +++ b/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; diff --git a/java/google/registry/model/contact/PostalInfo.java b/java/google/registry/model/contact/PostalInfo.java index 657d4e3fb..7b29cbd83 100644 --- a/java/google/registry/model/contact/PostalInfo.java +++ b/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; diff --git a/java/google/registry/model/contact/package-info.java b/java/google/registry/model/contact/package-info.java index ffc8564fd..0ee3ae0d2 100644 --- a/java/google/registry/model/contact/package-info.java +++ b/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; diff --git a/java/google/registry/model/domain/DesignatedContact.java b/java/google/registry/model/domain/DesignatedContact.java index c53f15665..ffb0c9f8f 100644 --- a/java/google/registry/model/domain/DesignatedContact.java +++ b/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; diff --git a/java/google/registry/model/domain/DomainApplication.java b/java/google/registry/model/domain/DomainApplication.java index 22bea831b..d9b5ca14c 100644 --- a/java/google/registry/model/domain/DomainApplication.java +++ b/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") diff --git a/java/google/registry/model/domain/DomainAuthInfo.java b/java/google/registry/model/domain/DomainAuthInfo.java index 5923a0abc..7be71e4fa 100644 --- a/java/google/registry/model/domain/DomainAuthInfo.java +++ b/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; diff --git a/java/google/registry/model/domain/DomainBase.java b/java/google/registry/model/domain/DomainBase.java index 312599e27..aa7e9ae2b 100644 --- a/java/google/registry/model/domain/DomainBase.java +++ b/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; diff --git a/java/google/registry/model/domain/DomainCommand.java b/java/google/registry/model/domain/DomainCommand.java index ecdae1a18..1d8d04c37 100644 --- a/java/google/registry/model/domain/DomainCommand.java +++ b/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 { diff --git a/java/google/registry/model/domain/DomainRenewData.java b/java/google/registry/model/domain/DomainRenewData.java index 7d18284cd..d5253fe14 100644 --- a/java/google/registry/model/domain/DomainRenewData.java +++ b/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") diff --git a/java/google/registry/model/domain/DomainResource.java b/java/google/registry/model/domain/DomainResource.java index 7c44c3abd..46ed38b3c 100644 --- a/java/google/registry/model/domain/DomainResource.java +++ b/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") diff --git a/java/google/registry/model/domain/ForeignKeyedDesignatedContact.java b/java/google/registry/model/domain/ForeignKeyedDesignatedContact.java index 3946769ed..fb6a230b5 100644 --- a/java/google/registry/model/domain/ForeignKeyedDesignatedContact.java +++ b/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; diff --git a/java/google/registry/model/domain/GracePeriod.java b/java/google/registry/model/domain/GracePeriod.java index faa535096..c1928b970 100644 --- a/java/google/registry/model/domain/GracePeriod.java +++ b/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. diff --git a/java/google/registry/model/domain/Period.java b/java/google/registry/model/domain/Period.java index c67b2d410..8a8a9a2c6 100644 --- a/java/google/registry/model/domain/Period.java +++ b/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; diff --git a/java/google/registry/model/domain/ReferenceUnion.java b/java/google/registry/model/domain/ReferenceUnion.java index 93a96c2cf..aa0ff5b27 100644 --- a/java/google/registry/model/domain/ReferenceUnion.java +++ b/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; diff --git a/java/google/registry/model/domain/allocate/AllocateCreateExtension.java b/java/google/registry/model/domain/allocate/AllocateCreateExtension.java index 869efdf07..952fc39ef 100644 --- a/java/google/registry/model/domain/allocate/AllocateCreateExtension.java +++ b/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 diff --git a/java/google/registry/model/domain/allocate/package-info.java b/java/google/registry/model/domain/allocate/package-info.java index 59a6360fe..e55c971ae 100644 --- a/java/google/registry/model/domain/allocate/package-info.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/BaseFee.java b/java/google/registry/model/domain/fee/BaseFee.java index fe0014a27..17a0e411b 100644 --- a/java/google/registry/model/domain/fee/BaseFee.java +++ b/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 diff --git a/java/google/registry/model/domain/fee/BaseFeeCommand.java b/java/google/registry/model/domain/fee/BaseFeeCommand.java index 05d241efb..1dba1e955 100644 --- a/java/google/registry/model/domain/fee/BaseFeeCommand.java +++ b/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 diff --git a/java/google/registry/model/domain/fee/BaseFeeCommandResponse.java b/java/google/registry/model/domain/fee/BaseFeeCommandResponse.java index fd3e3b6ea..9b2e8576f 100644 --- a/java/google/registry/model/domain/fee/BaseFeeCommandResponse.java +++ b/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 diff --git a/java/google/registry/model/domain/fee/BaseFeeRequest.java b/java/google/registry/model/domain/fee/BaseFeeRequest.java index 4d345427c..eb764a321 100644 --- a/java/google/registry/model/domain/fee/BaseFeeRequest.java +++ b/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 diff --git a/java/google/registry/model/domain/fee/BaseFeeResponse.java b/java/google/registry/model/domain/fee/BaseFeeResponse.java index 868b1cf20..9c2b1902a 100644 --- a/java/google/registry/model/domain/fee/BaseFeeResponse.java +++ b/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 diff --git a/java/google/registry/model/domain/fee/EapFee.java b/java/google/registry/model/domain/fee/EapFee.java index 8c9c751b5..608ba41e5 100644 --- a/java/google/registry/model/domain/fee/EapFee.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeCheckExtension.java b/java/google/registry/model/domain/fee/FeeCheckExtension.java index eb1e2e01a..e33d78587 100644 --- a/java/google/registry/model/domain/fee/FeeCheckExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeCheckResponseExtension.java b/java/google/registry/model/domain/fee/FeeCheckResponseExtension.java index 2991702c0..bb242a072 100644 --- a/java/google/registry/model/domain/fee/FeeCheckResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeCommandDescriptor.java b/java/google/registry/model/domain/fee/FeeCommandDescriptor.java index cb9e4bf8f..cc61f9944 100644 --- a/java/google/registry/model/domain/fee/FeeCommandDescriptor.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeCreateExtension.java b/java/google/registry/model/domain/fee/FeeCreateExtension.java index a06b14424..d8cf961ef 100644 --- a/java/google/registry/model/domain/fee/FeeCreateExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeCreateResponseExtension.java b/java/google/registry/model/domain/fee/FeeCreateResponseExtension.java index e5969f870..7c510dd60 100644 --- a/java/google/registry/model/domain/fee/FeeCreateResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeDeleteResponseExtension.java b/java/google/registry/model/domain/fee/FeeDeleteResponseExtension.java index 24104b1c1..b5a39c297 100644 --- a/java/google/registry/model/domain/fee/FeeDeleteResponseExtension.java +++ b/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 diff --git a/java/google/registry/model/domain/fee/FeeInfoExtension.java b/java/google/registry/model/domain/fee/FeeInfoExtension.java index 7c6ed852d..7c01736b3 100644 --- a/java/google/registry/model/domain/fee/FeeInfoExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeInfoResponseExtension.java b/java/google/registry/model/domain/fee/FeeInfoResponseExtension.java index 7f90ab156..fcf50f5e6 100644 --- a/java/google/registry/model/domain/fee/FeeInfoResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeRenewExtension.java b/java/google/registry/model/domain/fee/FeeRenewExtension.java index 782134bae..0df2180ba 100644 --- a/java/google/registry/model/domain/fee/FeeRenewExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeRenewResponseExtension.java b/java/google/registry/model/domain/fee/FeeRenewResponseExtension.java index bfc564b3e..b43e7a72c 100644 --- a/java/google/registry/model/domain/fee/FeeRenewResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeTransferExtension.java b/java/google/registry/model/domain/fee/FeeTransferExtension.java index c7f936691..24fff5f34 100644 --- a/java/google/registry/model/domain/fee/FeeTransferExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeTransferResponseExtension.java b/java/google/registry/model/domain/fee/FeeTransferResponseExtension.java index 534fbba1c..ba4b1a31f 100644 --- a/java/google/registry/model/domain/fee/FeeTransferResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeUpdateExtension.java b/java/google/registry/model/domain/fee/FeeUpdateExtension.java index 2e1a3867c..4eb8940f6 100644 --- a/java/google/registry/model/domain/fee/FeeUpdateExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeUpdateResponseExtension.java b/java/google/registry/model/domain/fee/FeeUpdateResponseExtension.java index 638755c62..df2c58ed5 100644 --- a/java/google/registry/model/domain/fee/FeeUpdateResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/package-info.java b/java/google/registry/model/domain/fee/package-info.java index 5015790f3..0d65ba249 100644 --- a/java/google/registry/model/domain/fee/package-info.java +++ b/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; diff --git a/java/google/registry/model/domain/launch/ApplicationStatus.java b/java/google/registry/model/domain/launch/ApplicationStatus.java index e92cc57a4..60e8ba59d 100644 --- a/java/google/registry/model/domain/launch/ApplicationStatus.java +++ b/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; /** diff --git a/java/google/registry/model/domain/launch/LaunchCheckExtension.java b/java/google/registry/model/domain/launch/LaunchCheckExtension.java index 9e0289ee6..a8be355e7 100644 --- a/java/google/registry/model/domain/launch/LaunchCheckExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java b/java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java index d4e0a068e..d5bb7720d 100644 --- a/java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/launch/LaunchCreateExtension.java b/java/google/registry/model/domain/launch/LaunchCreateExtension.java index fd27073aa..eb88023f8 100644 --- a/java/google/registry/model/domain/launch/LaunchCreateExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/launch/LaunchCreateResponseExtension.java b/java/google/registry/model/domain/launch/LaunchCreateResponseExtension.java index 973b21587..13f0a9d7d 100644 --- a/java/google/registry/model/domain/launch/LaunchCreateResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/launch/LaunchExtension.java b/java/google/registry/model/domain/launch/LaunchExtension.java index ec154f565..778ea8e82 100644 --- a/java/google/registry/model/domain/launch/LaunchExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/launch/LaunchInfoResponseExtension.java b/java/google/registry/model/domain/launch/LaunchInfoResponseExtension.java index 7a5741f98..fb65bfb2d 100644 --- a/java/google/registry/model/domain/launch/LaunchInfoResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/launch/LaunchNotice.java b/java/google/registry/model/domain/launch/LaunchNotice.java index 4497b550d..92986d9cf 100644 --- a/java/google/registry/model/domain/launch/LaunchNotice.java +++ b/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 diff --git a/java/google/registry/model/domain/launch/LaunchPhase.java b/java/google/registry/model/domain/launch/LaunchPhase.java index e748fd105..0efb4d381 100644 --- a/java/google/registry/model/domain/launch/LaunchPhase.java +++ b/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; diff --git a/java/google/registry/model/domain/launch/package-info.java b/java/google/registry/model/domain/launch/package-info.java index 868c053da..a4279ec27 100644 --- a/java/google/registry/model/domain/launch/package-info.java +++ b/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; diff --git a/java/google/registry/model/domain/metadata/MetadataExtension.java b/java/google/registry/model/domain/metadata/MetadataExtension.java index 6a04975ef..c6a2c3f63 100644 --- a/java/google/registry/model/domain/metadata/MetadataExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/package-info.java b/java/google/registry/model/domain/package-info.java index eece4ac01..a2ad39c58 100644 --- a/java/google/registry/model/domain/package-info.java +++ b/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; diff --git a/java/google/registry/model/domain/rgp/GracePeriodStatus.java b/java/google/registry/model/domain/rgp/GracePeriodStatus.java index f36574622..c9aff3019 100644 --- a/java/google/registry/model/domain/rgp/GracePeriodStatus.java +++ b/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; diff --git a/java/google/registry/model/domain/rgp/RgpInfoExtension.java b/java/google/registry/model/domain/rgp/RgpInfoExtension.java index 0f0312765..9ab6e7bbe 100644 --- a/java/google/registry/model/domain/rgp/RgpInfoExtension.java +++ b/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. */ diff --git a/java/google/registry/model/domain/rgp/RgpUpdateExtension.java b/java/google/registry/model/domain/rgp/RgpUpdateExtension.java index 83a07bb7c..93bdefef4 100644 --- a/java/google/registry/model/domain/rgp/RgpUpdateExtension.java +++ b/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. */ diff --git a/java/google/registry/model/domain/secdns/DelegationSignerData.java b/java/google/registry/model/domain/secdns/DelegationSignerData.java index 5007019df..1f2080f0c 100644 --- a/java/google/registry/model/domain/secdns/DelegationSignerData.java +++ b/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; diff --git a/java/google/registry/model/domain/secdns/SecDnsCreateExtension.java b/java/google/registry/model/domain/secdns/SecDnsCreateExtension.java index e6ca812e5..c5257d55f 100644 --- a/java/google/registry/model/domain/secdns/SecDnsCreateExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/secdns/SecDnsInfoExtension.java b/java/google/registry/model/domain/secdns/SecDnsInfoExtension.java index 7441a91e8..17403a9f8 100644 --- a/java/google/registry/model/domain/secdns/SecDnsInfoExtension.java +++ b/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. */ diff --git a/java/google/registry/model/domain/secdns/SecDnsUpdateExtension.java b/java/google/registry/model/domain/secdns/SecDnsUpdateExtension.java index cac8b66e2..438a3f8fd 100644 --- a/java/google/registry/model/domain/secdns/SecDnsUpdateExtension.java +++ b/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; diff --git a/java/google/registry/model/eppcommon/Address.java b/java/google/registry/model/eppcommon/Address.java index d924dfe28..063517b11 100644 --- a/java/google/registry/model/eppcommon/Address.java +++ b/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; diff --git a/java/google/registry/model/eppcommon/AuthInfo.java b/java/google/registry/model/eppcommon/AuthInfo.java index aefacaab4..4d3b34df0 100644 --- a/java/google/registry/model/eppcommon/AuthInfo.java +++ b/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; diff --git a/java/google/registry/model/eppcommon/PhoneNumber.java b/java/google/registry/model/eppcommon/PhoneNumber.java index db36779ac..266fb53d8 100644 --- a/java/google/registry/model/eppcommon/PhoneNumber.java +++ b/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; diff --git a/java/google/registry/model/eppcommon/PresenceMarker.java b/java/google/registry/model/eppcommon/PresenceMarker.java index 00ba8ac28..d770375c7 100644 --- a/java/google/registry/model/eppcommon/PresenceMarker.java +++ b/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; /** diff --git a/java/google/registry/model/eppcommon/ProtocolDefinition.java b/java/google/registry/model/eppcommon/ProtocolDefinition.java index a905b8cba..0efbe71ab 100644 --- a/java/google/registry/model/eppcommon/ProtocolDefinition.java +++ b/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. */ diff --git a/java/google/registry/model/eppcommon/StatusValue.java b/java/google/registry/model/eppcommon/StatusValue.java index eea1cfd89..0b7081757 100644 --- a/java/google/registry/model/eppcommon/StatusValue.java +++ b/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; /** diff --git a/java/google/registry/model/eppcommon/Trid.java b/java/google/registry/model/eppcommon/Trid.java index 19e069762..611ece7c7 100644 --- a/java/google/registry/model/eppcommon/Trid.java +++ b/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; diff --git a/java/google/registry/model/eppinput/EppInput.java b/java/google/registry/model/eppinput/EppInput.java index 61a8b160f..ffc516ffe 100644 --- a/java/google/registry/model/eppinput/EppInput.java +++ b/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; diff --git a/java/google/registry/model/eppinput/ResourceCommand.java b/java/google/registry/model/eppinput/ResourceCommand.java index c76c1e3ac..81da4b4f6 100644 --- a/java/google/registry/model/eppinput/ResourceCommand.java +++ b/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; diff --git a/java/google/registry/model/eppoutput/CheckData.java b/java/google/registry/model/eppoutput/CheckData.java index 97b420a40..64784181b 100644 --- a/java/google/registry/model/eppoutput/CheckData.java +++ b/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; diff --git a/java/google/registry/model/eppoutput/CreateData.java b/java/google/registry/model/eppoutput/CreateData.java index aac33f7b1..79d03313b 100644 --- a/java/google/registry/model/eppoutput/CreateData.java +++ b/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 diff --git a/java/google/registry/model/eppoutput/EppOutput.java b/java/google/registry/model/eppoutput/EppOutput.java index 6b68a2116..c51e129c3 100644 --- a/java/google/registry/model/eppoutput/EppOutput.java +++ b/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; diff --git a/java/google/registry/model/eppoutput/EppResponse.java b/java/google/registry/model/eppoutput/EppResponse.java index f1de5f2f1..0d048133f 100644 --- a/java/google/registry/model/eppoutput/EppResponse.java +++ b/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. diff --git a/java/google/registry/model/eppoutput/Greeting.java b/java/google/registry/model/eppoutput/Greeting.java index 6cdcdbbe9..e26d06d6c 100644 --- a/java/google/registry/model/eppoutput/Greeting.java +++ b/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"}. diff --git a/java/google/registry/model/eppoutput/Result.java b/java/google/registry/model/eppoutput/Result.java index 8c0c751ce..8b04912b0 100644 --- a/java/google/registry/model/eppoutput/Result.java +++ b/java/google/registry/model/eppoutput/Result.java @@ -18,9 +18,7 @@ import static google.registry.util.XmlEnumUtils.enumToXml; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; - import google.registry.model.ImmutableObject; - import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/java/google/registry/model/eppoutput/package-info.java b/java/google/registry/model/eppoutput/package-info.java index dead9c57b..e9229096c 100644 --- a/java/google/registry/model/eppoutput/package-info.java +++ b/java/google/registry/model/eppoutput/package-info.java @@ -21,7 +21,6 @@ package google.registry.model.eppoutput; import google.registry.xml.UtcDateTimeAdapter; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlNs; diff --git a/java/google/registry/model/export/LogsExportCursor.java b/java/google/registry/model/export/LogsExportCursor.java index c9753abc1..9656c29dd 100644 --- a/java/google/registry/model/export/LogsExportCursor.java +++ b/java/google/registry/model/export/LogsExportCursor.java @@ -18,13 +18,10 @@ import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.annotation.Entity; - import google.registry.model.Buildable; import google.registry.model.common.CrossTldSingleton; import google.registry.model.common.PersistedRangeLong; - import java.util.List; import java.util.Set; diff --git a/java/google/registry/model/host/HostCommand.java b/java/google/registry/model/host/HostCommand.java index 5654c7011..b849e29c1 100644 --- a/java/google/registry/model/host/HostCommand.java +++ b/java/google/registry/model/host/HostCommand.java @@ -19,15 +19,12 @@ import static google.registry.util.CollectionUtils.nullSafeImmutableCopy; import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableSet; - import google.registry.model.eppinput.ResourceCommand.AbstractSingleResourceCommand; import google.registry.model.eppinput.ResourceCommand.ResourceCheck; import google.registry.model.eppinput.ResourceCommand.ResourceCreateOrChange; import google.registry.model.eppinput.ResourceCommand.ResourceUpdate; - import java.net.InetAddress; import java.util.Set; - import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; diff --git a/java/google/registry/model/host/HostResource.java b/java/google/registry/model/host/HostResource.java index 865cd6d06..24eaeb3db 100644 --- a/java/google/registry/model/host/HostResource.java +++ b/java/google/registry/model/host/HostResource.java @@ -23,14 +23,12 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Ref; import com.googlecode.objectify.annotation.Cache; 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.EppResource.ForeignKeyedEppResource; import google.registry.model.annotations.ExternalMessagingName; @@ -38,16 +36,13 @@ import google.registry.model.domain.DomainResource; import google.registry.model.eppcommon.StatusValue; import google.registry.model.transfer.TransferData; import google.registry.model.transfer.TransferStatus; - -import org.joda.time.DateTime; - import java.net.InetAddress; 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; /** * A persistable Host resource including mutable and non-mutable fields. diff --git a/java/google/registry/model/host/InetAddressAdapter.java b/java/google/registry/model/host/InetAddressAdapter.java index 682dec5e6..9fee3d6ce 100644 --- a/java/google/registry/model/host/InetAddressAdapter.java +++ b/java/google/registry/model/host/InetAddressAdapter.java @@ -15,10 +15,8 @@ package google.registry.model.host; import com.google.common.net.InetAddresses; - import java.net.Inet6Address; import java.net.InetAddress; - import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlValue; import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; diff --git a/java/google/registry/model/host/package-info.java b/java/google/registry/model/host/package-info.java index 2a16c16d3..8cd18759c 100644 --- a/java/google/registry/model/host/package-info.java +++ b/java/google/registry/model/host/package-info.java @@ -23,7 +23,6 @@ package google.registry.model.host; import google.registry.xml.UtcDateTimeAdapter; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlNs; diff --git a/java/google/registry/model/index/DomainApplicationIndex.java b/java/google/registry/model/index/DomainApplicationIndex.java index 07355527f..a14ca9df7 100644 --- a/java/google/registry/model/index/DomainApplicationIndex.java +++ b/java/google/registry/model/index/DomainApplicationIndex.java @@ -22,22 +22,17 @@ import static google.registry.util.CollectionUtils.isNullOrEmpty; import static google.registry.util.DateTimeUtils.latestOf; 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.Entity; import com.googlecode.objectify.annotation.Id; - import google.registry.model.BackupGroupRoot; import google.registry.model.domain.DomainApplication; import google.registry.util.CollectionUtils; - -import org.joda.time.DateTime; - import java.util.Set; - import javax.annotation.Nullable; +import org.joda.time.DateTime; /** * Entity for tracking all domain applications with a given fully qualified domain name. Since this diff --git a/java/google/registry/model/index/EppResourceIndex.java b/java/google/registry/model/index/EppResourceIndex.java index fc1fc710e..015f2a315 100644 --- a/java/google/registry/model/index/EppResourceIndex.java +++ b/java/google/registry/model/index/EppResourceIndex.java @@ -17,14 +17,12 @@ package google.registry.model.index; import static google.registry.util.TypeUtils.instantiate; import com.google.common.annotations.VisibleForTesting; - 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.Index; import com.googlecode.objectify.annotation.Parent; - import google.registry.model.BackupGroupRoot; import google.registry.model.EppResource; diff --git a/java/google/registry/model/index/EppResourceIndexBucket.java b/java/google/registry/model/index/EppResourceIndexBucket.java index c703511fe..ff85e2dc6 100644 --- a/java/google/registry/model/index/EppResourceIndexBucket.java +++ b/java/google/registry/model/index/EppResourceIndexBucket.java @@ -16,11 +16,9 @@ package google.registry.model.index; import com.google.common.collect.ImmutableList; import com.google.common.hash.Hashing; - import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; - import google.registry.config.RegistryEnvironment; import google.registry.model.EppResource; import google.registry.model.ImmutableObject; diff --git a/java/google/registry/model/index/ForeignKeyIndex.java b/java/google/registry/model/index/ForeignKeyIndex.java index 5f0475008..034ffd4b0 100644 --- a/java/google/registry/model/index/ForeignKeyIndex.java +++ b/java/google/registry/model/index/ForeignKeyIndex.java @@ -22,23 +22,19 @@ import static google.registry.util.TypeUtils.instantiate; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; import com.googlecode.objectify.annotation.Cache; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Index; - import google.registry.model.BackupGroupRoot; import google.registry.model.EppResource; import google.registry.model.contact.ContactResource; import google.registry.model.domain.DomainResource; import google.registry.model.host.HostResource; - -import org.joda.time.DateTime; - import java.util.Map; +import org.joda.time.DateTime; /** * Class to map a foreign key to the active instance of {@link EppResource} whose unique id matches diff --git a/java/google/registry/model/mark/CommonMarkContactFields.java b/java/google/registry/model/mark/CommonMarkContactFields.java index 75eb34f71..e4ae3843d 100644 --- a/java/google/registry/model/mark/CommonMarkContactFields.java +++ b/java/google/registry/model/mark/CommonMarkContactFields.java @@ -15,7 +15,6 @@ package google.registry.model.mark; import google.registry.model.ImmutableObject; - import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlTransient; diff --git a/java/google/registry/model/mark/CommonMarkFields.java b/java/google/registry/model/mark/CommonMarkFields.java index 4341d25c8..6a5dc6973 100644 --- a/java/google/registry/model/mark/CommonMarkFields.java +++ b/java/google/registry/model/mark/CommonMarkFields.java @@ -17,11 +17,8 @@ package google.registry.model.mark; import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; - import google.registry.model.ImmutableObject; - import java.util.List; - import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlTransient; diff --git a/java/google/registry/model/mark/CourtMark.java b/java/google/registry/model/mark/CourtMark.java index 5911f9cbf..b010b79da 100644 --- a/java/google/registry/model/mark/CourtMark.java +++ b/java/google/registry/model/mark/CourtMark.java @@ -17,9 +17,7 @@ package google.registry.model.mark; import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; - import java.util.List; - import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; diff --git a/java/google/registry/model/mark/Mark.java b/java/google/registry/model/mark/Mark.java index c2aff2091..682bcab9c 100644 --- a/java/google/registry/model/mark/Mark.java +++ b/java/google/registry/model/mark/Mark.java @@ -17,11 +17,8 @@ package google.registry.model.mark; import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; - import google.registry.model.ImmutableObject; - import java.util.List; - import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/java/google/registry/model/mark/MarkProtection.java b/java/google/registry/model/mark/MarkProtection.java index d61512d20..4d477acb6 100644 --- a/java/google/registry/model/mark/MarkProtection.java +++ b/java/google/registry/model/mark/MarkProtection.java @@ -17,11 +17,8 @@ package google.registry.model.mark; import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; - import google.registry.model.ImmutableObject; - import java.util.List; - import javax.xml.bind.annotation.XmlElement; /** A country and region of a country where a mark is protected. */ diff --git a/java/google/registry/model/mark/ProtectedMark.java b/java/google/registry/model/mark/ProtectedMark.java index 78f9fbda4..02eaf2e24 100644 --- a/java/google/registry/model/mark/ProtectedMark.java +++ b/java/google/registry/model/mark/ProtectedMark.java @@ -14,10 +14,9 @@ package google.registry.model.mark; -import org.joda.time.DateTime; - import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlTransient; +import org.joda.time.DateTime; /** Common fields for {@link CourtMark} and {@link TreatyOrStatuteMark}. */ @XmlTransient diff --git a/java/google/registry/model/mark/Trademark.java b/java/google/registry/model/mark/Trademark.java index b8047d59a..64e93ca18 100644 --- a/java/google/registry/model/mark/Trademark.java +++ b/java/google/registry/model/mark/Trademark.java @@ -17,13 +17,10 @@ package google.registry.model.mark; import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; - -import org.joda.time.DateTime; - import java.util.List; - import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import org.joda.time.DateTime; /** Holds information about a registered trademark. */ @XmlType(propOrder = { diff --git a/java/google/registry/model/mark/TreatyOrStatuteMark.java b/java/google/registry/model/mark/TreatyOrStatuteMark.java index e43ec8953..c530f5181 100644 --- a/java/google/registry/model/mark/TreatyOrStatuteMark.java +++ b/java/google/registry/model/mark/TreatyOrStatuteMark.java @@ -17,13 +17,10 @@ package google.registry.model.mark; import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; - -import org.joda.time.DateTime; - import java.util.List; - import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import org.joda.time.DateTime; /** Information about a mark derived from a treaty or statute. */ @XmlType(propOrder = { diff --git a/java/google/registry/model/mark/package-info.java b/java/google/registry/model/mark/package-info.java index 1e1d2b054..b991ef6af 100644 --- a/java/google/registry/model/mark/package-info.java +++ b/java/google/registry/model/mark/package-info.java @@ -21,7 +21,6 @@ package google.registry.model.mark; import google.registry.xml.UtcDateTimeAdapter; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlNs; diff --git a/java/google/registry/model/ofy/AugmentedDeleter.java b/java/google/registry/model/ofy/AugmentedDeleter.java index 2848ede10..53fce6ba8 100644 --- a/java/google/registry/model/ofy/AugmentedDeleter.java +++ b/java/google/registry/model/ofy/AugmentedDeleter.java @@ -21,12 +21,10 @@ import static java.util.Arrays.asList; import com.google.common.base.Functions; import com.google.common.collect.FluentIterable; import com.google.common.collect.Iterables; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Result; import com.googlecode.objectify.cmd.DeleteType; import com.googlecode.objectify.cmd.Deleter; - import java.util.Arrays; /** diff --git a/java/google/registry/model/ofy/AugmentedSaver.java b/java/google/registry/model/ofy/AugmentedSaver.java index 5e8e99eff..c217aaf6f 100644 --- a/java/google/registry/model/ofy/AugmentedSaver.java +++ b/java/google/registry/model/ofy/AugmentedSaver.java @@ -18,11 +18,9 @@ import static com.googlecode.objectify.ObjectifyService.ofy; import com.google.appengine.api.datastore.Entity; import com.google.common.collect.ImmutableList; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Result; import com.googlecode.objectify.cmd.Saver; - import java.util.Arrays; import java.util.Map; diff --git a/java/google/registry/model/ofy/CommitLogBucket.java b/java/google/registry/model/ofy/CommitLogBucket.java index 5d306666e..08934127f 100644 --- a/java/google/registry/model/ofy/CommitLogBucket.java +++ b/java/google/registry/model/ofy/CommitLogBucket.java @@ -26,21 +26,17 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Range; - import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; - import google.registry.config.RegistryEnvironment; import google.registry.model.Buildable; import google.registry.model.ImmutableObject; import google.registry.model.annotations.NotBackedUp; import google.registry.model.annotations.NotBackedUp.Reason; import google.registry.util.NonFinalForTesting; - -import org.joda.time.DateTime; - import java.util.Random; +import org.joda.time.DateTime; /** * Root for a random commit log bucket. diff --git a/java/google/registry/model/ofy/CommitLogCheckpoint.java b/java/google/registry/model/ofy/CommitLogCheckpoint.java index 97b95bb09..0d61933cb 100644 --- a/java/google/registry/model/ofy/CommitLogCheckpoint.java +++ b/java/google/registry/model/ofy/CommitLogCheckpoint.java @@ -19,21 +19,17 @@ import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - 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.annotations.NotBackedUp; import google.registry.model.annotations.NotBackedUp.Reason; - -import org.joda.time.DateTime; - import java.util.ArrayList; import java.util.List; import java.util.Objects; +import org.joda.time.DateTime; /** * Entity representing a point-in-time consistent view of datastore, based on commit logs. diff --git a/java/google/registry/model/ofy/CommitLogCheckpointRoot.java b/java/google/registry/model/ofy/CommitLogCheckpointRoot.java index 59ccac86f..5f5c39ec1 100644 --- a/java/google/registry/model/ofy/CommitLogCheckpointRoot.java +++ b/java/google/registry/model/ofy/CommitLogCheckpointRoot.java @@ -20,11 +20,9 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.googlecode.objectify.Key; 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; - import org.joda.time.DateTime; /** diff --git a/java/google/registry/model/ofy/CommitLogManifest.java b/java/google/registry/model/ofy/CommitLogManifest.java index 40ef2b227..956041279 100644 --- a/java/google/registry/model/ofy/CommitLogManifest.java +++ b/java/google/registry/model/ofy/CommitLogManifest.java @@ -18,20 +18,16 @@ import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableSet; - 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.annotations.NotBackedUp; import google.registry.model.annotations.NotBackedUp.Reason; - -import org.joda.time.DateTime; - import java.util.LinkedHashSet; import java.util.Set; +import org.joda.time.DateTime; /** * Archived datastore transaction that can be replayed. diff --git a/java/google/registry/model/ofy/CommitLogMutation.java b/java/google/registry/model/ofy/CommitLogMutation.java index 09ed981af..b765895e2 100644 --- a/java/google/registry/model/ofy/CommitLogMutation.java +++ b/java/google/registry/model/ofy/CommitLogMutation.java @@ -21,12 +21,10 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.appengine.api.datastore.KeyFactory; import com.google.common.annotations.VisibleForTesting; - 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.annotations.NotBackedUp; import google.registry.model.annotations.NotBackedUp.Reason; diff --git a/java/google/registry/model/ofy/CommitLoggedWork.java b/java/google/registry/model/ofy/CommitLoggedWork.java index d6b07237b..23c4ab5f0 100644 --- a/java/google/registry/model/ofy/CommitLoggedWork.java +++ b/java/google/registry/model/ofy/CommitLoggedWork.java @@ -28,21 +28,17 @@ import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.Work; - import google.registry.model.BackupGroupRoot; import google.registry.model.ImmutableObject; import google.registry.util.Clock; - -import org.joda.time.DateTime; - import java.util.HashSet; import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import org.joda.time.DateTime; /** Wrapper for {@link Work} that associates a time with each attempt. */ class CommitLoggedWork extends VoidWork { diff --git a/java/google/registry/model/ofy/ObjectifyService.java b/java/google/registry/model/ofy/ObjectifyService.java index f88c738e0..0b8cba20e 100644 --- a/java/google/registry/model/ofy/ObjectifyService.java +++ b/java/google/registry/model/ofy/ObjectifyService.java @@ -25,7 +25,6 @@ import com.google.appengine.api.datastore.DatastoreServiceConfig; import com.google.appengine.api.datastore.DatastoreServiceFactory; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Iterables; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Objectify; import com.googlecode.objectify.ObjectifyFactory; @@ -33,7 +32,6 @@ import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.EntitySubclass; import com.googlecode.objectify.impl.translate.TranslatorFactory; import com.googlecode.objectify.impl.translate.opt.joda.MoneyStringTranslatorFactory; - import google.registry.config.RegistryEnvironment; import google.registry.model.EntityClasses; import google.registry.model.ImmutableObject; @@ -45,7 +43,6 @@ import google.registry.model.translators.DurationTranslatorFactory; import google.registry.model.translators.InetAddressTranslatorFactory; import google.registry.model.translators.ReadableInstantUtcTranslatorFactory; import google.registry.model.translators.UpdateAutoTimestampTranslatorFactory; - import java.util.Arrays; import java.util.concurrent.atomic.AtomicLong; import java.util.logging.Level; diff --git a/java/google/registry/model/ofy/Ofy.java b/java/google/registry/model/ofy/Ofy.java index 8b0230dc8..aff965ad5 100644 --- a/java/google/registry/model/ofy/Ofy.java +++ b/java/google/registry/model/ofy/Ofy.java @@ -30,7 +30,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Objectify; import com.googlecode.objectify.ObjectifyFactory; @@ -38,7 +37,6 @@ import com.googlecode.objectify.Work; import com.googlecode.objectify.cmd.Deleter; import com.googlecode.objectify.cmd.Loader; import com.googlecode.objectify.cmd.Saver; - import google.registry.config.RegistryEnvironment; import google.registry.model.annotations.NotBackedUp; import google.registry.model.annotations.VirtualEntity; @@ -49,14 +47,11 @@ import google.registry.util.NonFinalForTesting; import google.registry.util.Sleeper; import google.registry.util.SystemClock; import google.registry.util.SystemSleeper; - -import org.joda.time.DateTime; -import org.joda.time.Duration; - import java.lang.annotation.Annotation; import java.util.Objects; - import javax.inject.Inject; +import org.joda.time.DateTime; +import org.joda.time.Duration; /** * A wrapper around ofy(). diff --git a/java/google/registry/model/ofy/OfyFilter.java b/java/google/registry/model/ofy/OfyFilter.java index ba837c7db..8c872a0dd 100644 --- a/java/google/registry/model/ofy/OfyFilter.java +++ b/java/google/registry/model/ofy/OfyFilter.java @@ -16,7 +16,6 @@ package google.registry.model.ofy; import java.io.IOException; - import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/java/google/registry/model/ofy/ReadOnlyWork.java b/java/google/registry/model/ofy/ReadOnlyWork.java index 86db82d75..e3f2f326a 100644 --- a/java/google/registry/model/ofy/ReadOnlyWork.java +++ b/java/google/registry/model/ofy/ReadOnlyWork.java @@ -15,7 +15,6 @@ package google.registry.model.ofy; import com.googlecode.objectify.Work; - import google.registry.util.Clock; /** Wrapper for {@link Work} that disallows mutations and fails the transaction at the end. */ diff --git a/java/google/registry/model/ofy/RequestCapturingAsyncDatastoreService.java b/java/google/registry/model/ofy/RequestCapturingAsyncDatastoreService.java index 6ebcf2081..9467bbc88 100644 --- a/java/google/registry/model/ofy/RequestCapturingAsyncDatastoreService.java +++ b/java/google/registry/model/ofy/RequestCapturingAsyncDatastoreService.java @@ -28,7 +28,6 @@ import com.google.appengine.api.datastore.Query; import com.google.appengine.api.datastore.Transaction; import com.google.appengine.api.datastore.TransactionOptions; import com.google.common.collect.ImmutableList; - import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/java/google/registry/model/ofy/SessionKeyExposingObjectify.java b/java/google/registry/model/ofy/SessionKeyExposingObjectify.java index 2beb94832..ebd9e7f21 100644 --- a/java/google/registry/model/ofy/SessionKeyExposingObjectify.java +++ b/java/google/registry/model/ofy/SessionKeyExposingObjectify.java @@ -15,7 +15,6 @@ package google.registry.model.ofy; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.ObjectifyFactory; import com.googlecode.objectify.impl.ObjectifyImpl; diff --git a/java/google/registry/model/ofy/TimestampInversionException.java b/java/google/registry/model/ofy/TimestampInversionException.java index 7057dc6b1..193fc4ea5 100644 --- a/java/google/registry/model/ofy/TimestampInversionException.java +++ b/java/google/registry/model/ofy/TimestampInversionException.java @@ -19,15 +19,11 @@ import static java.util.Arrays.asList; import com.google.common.base.Joiner; import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Objectify; - import google.registry.model.BackupGroupRoot; - -import org.joda.time.DateTime; - import java.util.Map; +import org.joda.time.DateTime; /** * Exception when trying to write to the datastore with a timestamp that is inconsistent with diff --git a/java/google/registry/model/ofy/TransactionInfo.java b/java/google/registry/model/ofy/TransactionInfo.java index 9828e0d18..02929de2c 100644 --- a/java/google/registry/model/ofy/TransactionInfo.java +++ b/java/google/registry/model/ofy/TransactionInfo.java @@ -26,12 +26,9 @@ import com.google.common.base.Predicates; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; - -import org.joda.time.DateTime; - import java.util.Map; +import org.joda.time.DateTime; /** Metadata for an {@link Ofy} transaction that saves commit logs. */ class TransactionInfo { diff --git a/java/google/registry/model/package-info.java b/java/google/registry/model/package-info.java index 166137455..ac647eee0 100644 --- a/java/google/registry/model/package-info.java +++ b/java/google/registry/model/package-info.java @@ -21,7 +21,6 @@ package google.registry.model; import google.registry.xml.UtcDateTimeAdapter; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlNs; diff --git a/java/google/registry/model/poll/MessageQueueInfo.java b/java/google/registry/model/poll/MessageQueueInfo.java index 7b3adbde0..b3d7fc5e4 100644 --- a/java/google/registry/model/poll/MessageQueueInfo.java +++ b/java/google/registry/model/poll/MessageQueueInfo.java @@ -15,11 +15,9 @@ package google.registry.model.poll; import google.registry.model.ImmutableObject; - -import org.joda.time.DateTime; - import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; +import org.joda.time.DateTime; /** Information about the message queue for the currently logged in registrar. */ public class MessageQueueInfo extends ImmutableObject { diff --git a/java/google/registry/model/poll/PendingActionNotificationResponse.java b/java/google/registry/model/poll/PendingActionNotificationResponse.java index 05866999a..c6ae3faab 100644 --- a/java/google/registry/model/poll/PendingActionNotificationResponse.java +++ b/java/google/registry/model/poll/PendingActionNotificationResponse.java @@ -16,21 +16,17 @@ package google.registry.model.poll; import com.google.common.annotations.VisibleForTesting; - import com.googlecode.objectify.annotation.Embed; - import google.registry.model.ImmutableObject; import google.registry.model.eppcommon.Trid; import google.registry.model.eppoutput.EppResponse.ResponseData; - -import org.joda.time.DateTime; - import javax.xml.bind.annotation.XmlAttribute; 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.XmlValue; +import org.joda.time.DateTime; /** The {@link ResponseData} returned when completing a pending action on a domain. */ @XmlTransient diff --git a/java/google/registry/model/poll/PollMessage.java b/java/google/registry/model/poll/PollMessage.java index c8c051a7b..ebfe7895d 100644 --- a/java/google/registry/model/poll/PollMessage.java +++ b/java/google/registry/model/poll/PollMessage.java @@ -25,14 +25,12 @@ import com.google.common.base.Converter; import com.google.common.base.Optional; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; - import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.EntitySubclass; 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.EppResource; import google.registry.model.ImmutableObject; @@ -49,10 +47,8 @@ import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferData.TransferServerApproveEntity; import google.registry.model.transfer.TransferResponse.ContactTransferResponse; import google.registry.model.transfer.TransferResponse.DomainTransferResponse; - -import org.joda.time.DateTime; - import java.util.List; +import org.joda.time.DateTime; /** A poll message that is pending for a registrar. */ @Entity diff --git a/java/google/registry/model/poll/PollMessageExternalKeyConverter.java b/java/google/registry/model/poll/PollMessageExternalKeyConverter.java index fee39b3c1..8dced7be9 100644 --- a/java/google/registry/model/poll/PollMessageExternalKeyConverter.java +++ b/java/google/registry/model/poll/PollMessageExternalKeyConverter.java @@ -19,15 +19,12 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.base.Converter; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableBiMap; - import com.googlecode.objectify.Key; - import google.registry.model.EppResource; import google.registry.model.contact.ContactResource; import google.registry.model.domain.DomainBase; import google.registry.model.host.HostResource; import google.registry.model.reporting.HistoryEntry; - import java.util.List; /** diff --git a/java/google/registry/model/poll/package-info.java b/java/google/registry/model/poll/package-info.java index f3f0d34ee..bc34877d6 100644 --- a/java/google/registry/model/poll/package-info.java +++ b/java/google/registry/model/poll/package-info.java @@ -21,7 +21,6 @@ package google.registry.model.poll; import google.registry.xml.UtcDateTimeAdapter; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlNs; diff --git a/java/google/registry/model/pricing/PremiumPricingEngine.java b/java/google/registry/model/pricing/PremiumPricingEngine.java index 1bd2c683f..381a294b7 100644 --- a/java/google/registry/model/pricing/PremiumPricingEngine.java +++ b/java/google/registry/model/pricing/PremiumPricingEngine.java @@ -15,7 +15,6 @@ package google.registry.model.pricing; import com.google.common.base.Optional; - import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java b/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java index 2c800dc2b..18a8bd9e3 100644 --- a/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java +++ b/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java @@ -25,15 +25,12 @@ import static google.registry.util.DomainNameUtils.getTldFromDomainName; import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.net.InternetDomainName; - import google.registry.model.registry.Registry; import google.registry.model.registry.label.PremiumList; - +import javax.inject.Inject; import org.joda.money.Money; import org.joda.time.DateTime; -import javax.inject.Inject; - /** A premium list pricing engine that stores static pricing information in Datastore entities. */ public final class StaticPremiumListPricingEngine implements PremiumPricingEngine { diff --git a/java/google/registry/model/rde/RdeRevision.java b/java/google/registry/model/rde/RdeRevision.java index b3c2062db..3bdfc5267 100644 --- a/java/google/registry/model/rde/RdeRevision.java +++ b/java/google/registry/model/rde/RdeRevision.java @@ -21,12 +21,9 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.model.rde.RdeNamingUtils.makePartialName; import com.google.common.base.VerifyException; - import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; - import google.registry.model.ImmutableObject; - import org.joda.time.DateTime; /** diff --git a/java/google/registry/model/registrar/Registrar.java b/java/google/registry/model/registrar/Registrar.java index 0113276cb..afc02b09f 100644 --- a/java/google/registry/model/registrar/Registrar.java +++ b/java/google/registry/model/registrar/Registrar.java @@ -44,7 +44,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Sets; import com.google.re2j.Pattern; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Work; import com.googlecode.objectify.annotation.Cache; @@ -54,7 +53,6 @@ import com.googlecode.objectify.annotation.IgnoreSave; import com.googlecode.objectify.annotation.Index; import com.googlecode.objectify.annotation.Parent; import com.googlecode.objectify.condition.IfNull; - import google.registry.config.RegistryEnvironment; import google.registry.model.Buildable; import google.registry.model.CreateAutoTimestamp; @@ -65,9 +63,6 @@ import google.registry.model.UpdateAutoTimestamp; import google.registry.model.common.EntityGroupRoot; import google.registry.util.CidrAddressBlock; import google.registry.util.NonFinalForTesting; - -import org.joda.time.DateTime; - import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; @@ -77,6 +72,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; +import org.joda.time.DateTime; /** Information about a registrar. */ @Cache(expirationSeconds = RECOMMENDED_MEMCACHE_EXPIRATION) diff --git a/java/google/registry/model/registrar/RegistrarAddress.java b/java/google/registry/model/registrar/RegistrarAddress.java index 9ab88280a..4342dcd84 100644 --- a/java/google/registry/model/registrar/RegistrarAddress.java +++ b/java/google/registry/model/registrar/RegistrarAddress.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static google.registry.util.CollectionUtils.forceEmptyToNull; import com.googlecode.objectify.annotation.Embed; - import google.registry.model.eppcommon.Address; /** diff --git a/java/google/registry/model/registrar/RegistrarContact.java b/java/google/registry/model/registrar/RegistrarContact.java index 81905a32b..bf6f78781 100644 --- a/java/google/registry/model/registrar/RegistrarContact.java +++ b/java/google/registry/model/registrar/RegistrarContact.java @@ -28,7 +28,6 @@ import com.google.common.base.Joiner; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.annotation.Cache; @@ -36,12 +35,10 @@ 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 java.util.Arrays; import java.util.Map; import java.util.Set; diff --git a/java/google/registry/model/registry/Registries.java b/java/google/registry/model/registry/Registries.java index 92f73ce66..4e8e16b41 100644 --- a/java/google/registry/model/registry/Registries.java +++ b/java/google/registry/model/registry/Registries.java @@ -29,9 +29,7 @@ import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.net.InternetDomainName; - import com.googlecode.objectify.Work; - import google.registry.model.registry.Registry.TldType; /** Utilities for finding and listing {@link Registry} entities. */ diff --git a/java/google/registry/model/registry/Registry.java b/java/google/registry/model/registry/Registry.java index 6f20c8706..faf93bc65 100644 --- a/java/google/registry/model/registry/Registry.java +++ b/java/google/registry/model/registry/Registry.java @@ -40,7 +40,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Ordering; import com.google.common.collect.Range; import com.google.common.net.InternetDomainName; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Work; import com.googlecode.objectify.annotation.Cache; @@ -51,7 +50,6 @@ import com.googlecode.objectify.annotation.Mapify; import com.googlecode.objectify.annotation.OnLoad; import com.googlecode.objectify.annotation.OnSave; import com.googlecode.objectify.annotation.Parent; - import google.registry.config.RegistryEnvironment; import google.registry.model.Buildable; import google.registry.model.CreateAutoTimestamp; @@ -65,14 +63,12 @@ import google.registry.model.pricing.StaticPremiumListPricingEngine; import google.registry.model.registry.label.PremiumList; import google.registry.model.registry.label.ReservedList; import google.registry.util.Idn; - +import java.util.Set; import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.joda.time.DateTime; import org.joda.time.Duration; -import java.util.Set; - /** Persisted per-TLD configuration data. */ @Cache(expirationSeconds = RECOMMENDED_MEMCACHE_EXPIRATION) @Entity diff --git a/java/google/registry/model/registry/label/BaseDomainLabelList.java b/java/google/registry/model/registry/label/BaseDomainLabelList.java index c41007bca..735a05463 100644 --- a/java/google/registry/model/registry/label/BaseDomainLabelList.java +++ b/java/google/registry/model/registry/label/BaseDomainLabelList.java @@ -28,25 +28,20 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Ordering; import com.google.common.util.concurrent.UncheckedExecutionException; - import com.googlecode.objectify.Key; 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.common.EntityGroupRoot; import google.registry.model.registry.Registry; import google.registry.model.registry.label.ReservedList.ReservedListEntry; - -import org.joda.time.DateTime; - import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; - import javax.annotation.Nullable; +import org.joda.time.DateTime; /** * Base class for {@link ReservedList} and {@link PremiumList} objects stored in Datastore. diff --git a/java/google/registry/model/registry/label/DomainLabelEntry.java b/java/google/registry/model/registry/label/DomainLabelEntry.java index 65587dc6b..8ebd40fcd 100644 --- a/java/google/registry/model/registry/label/DomainLabelEntry.java +++ b/java/google/registry/model/registry/label/DomainLabelEntry.java @@ -18,7 +18,6 @@ import static com.google.common.base.Strings.emptyToNull; import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import com.googlecode.objectify.annotation.Id; - import google.registry.model.Buildable.GenericBuilder; import google.registry.model.ImmutableObject; diff --git a/java/google/registry/model/registry/label/PremiumList.java b/java/google/registry/model/registry/label/PremiumList.java index cb913253e..82760f6c3 100644 --- a/java/google/registry/model/registry/label/PremiumList.java +++ b/java/google/registry/model/registry/label/PremiumList.java @@ -38,7 +38,6 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.util.concurrent.UncheckedExecutionException; - import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.Work; @@ -49,22 +48,18 @@ import com.googlecode.objectify.annotation.Ignore; import com.googlecode.objectify.annotation.OnLoad; import com.googlecode.objectify.annotation.Parent; import com.googlecode.objectify.cmd.Query; - import google.registry.config.RegistryEnvironment; import google.registry.model.Buildable; import google.registry.model.ImmutableObject; import google.registry.model.annotations.VirtualEntity; import google.registry.model.registry.Registry; - -import org.joda.money.Money; -import org.joda.time.DateTime; - import java.util.List; import java.util.Map; import java.util.Objects; import java.util.concurrent.ExecutionException; - import javax.annotation.Nullable; +import org.joda.money.Money; +import org.joda.time.DateTime; /** * A premium list entity, persisted to Datastore, that is used to check domain label prices. diff --git a/java/google/registry/model/registry/label/ReservedList.java b/java/google/registry/model/registry/label/ReservedList.java index 4c154a1d1..d22084111 100644 --- a/java/google/registry/model/registry/label/ReservedList.java +++ b/java/google/registry/model/registry/label/ReservedList.java @@ -34,7 +34,6 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.UncheckedExecutionException; - import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.annotation.Cache; @@ -42,15 +41,12 @@ import com.googlecode.objectify.annotation.Embed; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Mapify; import com.googlecode.objectify.mapper.Mapper; - import google.registry.config.RegistryEnvironment; import google.registry.model.registry.Registry; - import java.util.List; import java.util.Map; import java.util.Objects; import java.util.concurrent.ExecutionException; - import javax.annotation.Nullable; /** diff --git a/java/google/registry/model/reporting/HistoryEntry.java b/java/google/registry/model/reporting/HistoryEntry.java index 21b28ca0b..cfea2a03d 100644 --- a/java/google/registry/model/reporting/HistoryEntry.java +++ b/java/google/registry/model/reporting/HistoryEntry.java @@ -22,13 +22,11 @@ import com.googlecode.objectify.annotation.IgnoreSave; import com.googlecode.objectify.annotation.Index; import com.googlecode.objectify.annotation.Parent; import com.googlecode.objectify.condition.IfNull; - import google.registry.model.Buildable; import google.registry.model.EppResource; import google.registry.model.ImmutableObject; import google.registry.model.domain.Period; import google.registry.model.eppcommon.Trid; - import org.joda.time.DateTime; /** A record of an EPP command that mutated a resource. */ diff --git a/java/google/registry/model/server/Lock.java b/java/google/registry/model/server/Lock.java index 10ad1a6c9..8c1ad5e8d 100644 --- a/java/google/registry/model/server/Lock.java +++ b/java/google/registry/model/server/Lock.java @@ -27,28 +27,23 @@ import com.google.common.base.Strings; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSortedSet; - 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; import google.registry.util.AppEngineTimeLimiter; import google.registry.util.FormattingLogger; - -import org.joda.time.DateTime; -import org.joda.time.Duration; - import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; - import javax.annotation.Nullable; +import org.joda.time.DateTime; +import org.joda.time.Duration; /** * A lock on some shared resource. Locks are either specific to a tld or global to the entire diff --git a/java/google/registry/model/server/ServerSecret.java b/java/google/registry/model/server/ServerSecret.java index 7ad13a2b5..fd3d7c7b5 100644 --- a/java/google/registry/model/server/ServerSecret.java +++ b/java/google/registry/model/server/ServerSecret.java @@ -21,11 +21,9 @@ import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.annotation.Cache; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Unindex; - import google.registry.model.annotations.NotBackedUp; import google.registry.model.annotations.NotBackedUp.Reason; import google.registry.model.common.CrossTldSingleton; - import java.util.UUID; /** A secret number used for generating tokens (such as XSRF tokens). */ diff --git a/java/google/registry/model/smd/EncodedSignedMark.java b/java/google/registry/model/smd/EncodedSignedMark.java index 61959380a..381d94fe2 100644 --- a/java/google/registry/model/smd/EncodedSignedMark.java +++ b/java/google/registry/model/smd/EncodedSignedMark.java @@ -18,11 +18,8 @@ import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.io.BaseEncoding.base64; import com.google.appengine.api.datastore.Text; - import com.googlecode.objectify.annotation.Embed; - import google.registry.model.ImmutableObject; - import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlValue; diff --git a/java/google/registry/model/smd/IssuerInfo.java b/java/google/registry/model/smd/IssuerInfo.java index 2ca2d2dd4..7d5bbdb0b 100644 --- a/java/google/registry/model/smd/IssuerInfo.java +++ b/java/google/registry/model/smd/IssuerInfo.java @@ -16,7 +16,6 @@ package google.registry.model.smd; import google.registry.model.ImmutableObject; import google.registry.model.mark.MarkPhoneNumber; - import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; diff --git a/java/google/registry/model/smd/RemoveWhitespaceTextAdapter.java b/java/google/registry/model/smd/RemoveWhitespaceTextAdapter.java index 8fc09b377..6f455c685 100644 --- a/java/google/registry/model/smd/RemoveWhitespaceTextAdapter.java +++ b/java/google/registry/model/smd/RemoveWhitespaceTextAdapter.java @@ -16,7 +16,6 @@ package google.registry.model.smd; import com.google.appengine.api.datastore.Text; import com.google.common.base.CharMatcher; - import javax.xml.bind.annotation.adapters.XmlAdapter; /** diff --git a/java/google/registry/model/smd/SignedMark.java b/java/google/registry/model/smd/SignedMark.java index 86d748bd6..34e8c7e48 100644 --- a/java/google/registry/model/smd/SignedMark.java +++ b/java/google/registry/model/smd/SignedMark.java @@ -16,13 +16,11 @@ package google.registry.model.smd; import google.registry.model.ImmutableObject; import google.registry.model.mark.Mark; - -import org.joda.time.DateTime; - import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlRootElement; +import org.joda.time.DateTime; /** * Represents an XML fragment that is digitally signed by the TMCH to prove ownership over a mark. diff --git a/java/google/registry/model/smd/SignedMarkRevocationList.java b/java/google/registry/model/smd/SignedMarkRevocationList.java index 38641d636..7bb812c96 100644 --- a/java/google/registry/model/smd/SignedMarkRevocationList.java +++ b/java/google/registry/model/smd/SignedMarkRevocationList.java @@ -30,7 +30,6 @@ import com.google.common.base.Supplier; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; - import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.Work; @@ -40,16 +39,13 @@ import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Ignore; import com.googlecode.objectify.annotation.OnSave; import com.googlecode.objectify.annotation.Parent; - import google.registry.model.ImmutableObject; import google.registry.model.annotations.NotBackedUp; import google.registry.model.annotations.NotBackedUp.Reason; import google.registry.model.common.EntityGroupRoot; import google.registry.util.CollectionUtils; - -import org.joda.time.DateTime; - import java.util.Map; +import org.joda.time.DateTime; /** * Signed Mark Data Revocation List (SMDRL). diff --git a/java/google/registry/model/smd/package-info.java b/java/google/registry/model/smd/package-info.java index 7de476d9c..06388f0e1 100644 --- a/java/google/registry/model/smd/package-info.java +++ b/java/google/registry/model/smd/package-info.java @@ -21,7 +21,6 @@ package google.registry.model.smd; import google.registry.xml.UtcDateTimeAdapter; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlNs; diff --git a/java/google/registry/model/tmch/ClaimsListShard.java b/java/google/registry/model/tmch/ClaimsListShard.java index a954693c5..58d106b61 100644 --- a/java/google/registry/model/tmch/ClaimsListShard.java +++ b/java/google/registry/model/tmch/ClaimsListShard.java @@ -27,7 +27,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; - import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.Work; @@ -38,7 +37,6 @@ import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Ignore; import com.googlecode.objectify.annotation.OnSave; import com.googlecode.objectify.annotation.Parent; - import google.registry.model.ImmutableObject; import google.registry.model.annotations.NotBackedUp; import google.registry.model.annotations.NotBackedUp.Reason; @@ -46,14 +44,11 @@ import google.registry.model.annotations.VirtualEntity; import google.registry.model.common.CrossTldSingleton; import google.registry.util.CollectionUtils; import google.registry.util.Concurrent; - -import org.joda.time.DateTime; - import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.annotation.Nullable; +import org.joda.time.DateTime; /** * A list of TMCH claims labels and their associated claims keys. diff --git a/java/google/registry/model/tmch/TmchCrl.java b/java/google/registry/model/tmch/TmchCrl.java index de9d9a634..31f090f19 100644 --- a/java/google/registry/model/tmch/TmchCrl.java +++ b/java/google/registry/model/tmch/TmchCrl.java @@ -21,15 +21,12 @@ import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.annotation.Cache; import com.googlecode.objectify.annotation.Entity; - import google.registry.model.annotations.NotBackedUp; import google.registry.model.annotations.NotBackedUp.Reason; import google.registry.model.common.CrossTldSingleton; - -import org.joda.time.DateTime; - import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; +import org.joda.time.DateTime; /** Datastore singleton for ICANN's TMCH CA certificate revocation list (CRL). */ @Entity diff --git a/java/google/registry/model/transfer/BaseTransferObject.java b/java/google/registry/model/transfer/BaseTransferObject.java index 461fb0b3c..59cc1bf29 100644 --- a/java/google/registry/model/transfer/BaseTransferObject.java +++ b/java/google/registry/model/transfer/BaseTransferObject.java @@ -16,11 +16,9 @@ package google.registry.model.transfer; import google.registry.model.Buildable.GenericBuilder; import google.registry.model.ImmutableObject; - -import org.joda.time.DateTime; - import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlTransient; +import org.joda.time.DateTime; /** Fields common to {@link TransferData} and {@link TransferResponse}. */ @XmlTransient diff --git a/java/google/registry/model/transfer/TransferData.java b/java/google/registry/model/transfer/TransferData.java index 4918cdf39..a683a726b 100644 --- a/java/google/registry/model/transfer/TransferData.java +++ b/java/google/registry/model/transfer/TransferData.java @@ -17,20 +17,17 @@ package google.registry.model.transfer; import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; import com.googlecode.objectify.annotation.Embed; import com.googlecode.objectify.annotation.IgnoreSave; import com.googlecode.objectify.annotation.Unindex; import com.googlecode.objectify.condition.IfNull; - import google.registry.model.Buildable; import google.registry.model.EppResource; import google.registry.model.billing.BillingEvent; import google.registry.model.eppcommon.Trid; import google.registry.model.poll.PollMessage; - import java.util.Set; /** diff --git a/java/google/registry/model/transfer/TransferResponse.java b/java/google/registry/model/transfer/TransferResponse.java index 1a43edaa7..0de8e3ac6 100644 --- a/java/google/registry/model/transfer/TransferResponse.java +++ b/java/google/registry/model/transfer/TransferResponse.java @@ -15,16 +15,13 @@ package google.registry.model.transfer; import com.googlecode.objectify.annotation.Embed; - import google.registry.model.EppResource; 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; /** * A response to a transfer command on a {@link EppResource}. This base class contains fields that diff --git a/java/google/registry/model/transfer/TransferStatus.java b/java/google/registry/model/transfer/TransferStatus.java index d47205d83..0b9d985f0 100644 --- a/java/google/registry/model/transfer/TransferStatus.java +++ b/java/google/registry/model/transfer/TransferStatus.java @@ -15,7 +15,6 @@ package google.registry.model.transfer; import com.google.common.base.CaseFormat; - import javax.xml.bind.annotation.XmlEnumValue; /** Represents the EPP transfer status as defined in RFC 5730. */ diff --git a/java/google/registry/model/transfer/package-info.java b/java/google/registry/model/transfer/package-info.java index a04c87fc9..995959019 100644 --- a/java/google/registry/model/transfer/package-info.java +++ b/java/google/registry/model/transfer/package-info.java @@ -21,7 +21,6 @@ package google.registry.model.transfer; import google.registry.xml.UtcDateTimeAdapter; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlNs; diff --git a/java/google/registry/model/translators/AbstractSimpleTranslatorFactory.java b/java/google/registry/model/translators/AbstractSimpleTranslatorFactory.java index 774be343b..d7ab3d1de 100644 --- a/java/google/registry/model/translators/AbstractSimpleTranslatorFactory.java +++ b/java/google/registry/model/translators/AbstractSimpleTranslatorFactory.java @@ -21,9 +21,7 @@ import com.googlecode.objectify.impl.translate.LoadContext; import com.googlecode.objectify.impl.translate.SaveContext; import com.googlecode.objectify.impl.translate.ValueTranslator; import com.googlecode.objectify.impl.translate.ValueTranslatorFactory; - import google.registry.util.TypeUtils.TypeInstantiator; - import java.lang.reflect.Type; /** Common boilerplate for translator factories. */ diff --git a/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactory.java b/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactory.java index 91916dcfa..f3ec7e956 100644 --- a/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactory.java +++ b/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactory.java @@ -20,12 +20,9 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Ordering; - import com.googlecode.objectify.Ref; - import google.registry.config.RegistryEnvironment; import google.registry.model.ofy.CommitLogManifest; - import org.joda.time.DateTime; /** diff --git a/java/google/registry/model/translators/CreateAutoTimestampTranslatorFactory.java b/java/google/registry/model/translators/CreateAutoTimestampTranslatorFactory.java index 6637dba82..78753228f 100644 --- a/java/google/registry/model/translators/CreateAutoTimestampTranslatorFactory.java +++ b/java/google/registry/model/translators/CreateAutoTimestampTranslatorFactory.java @@ -19,10 +19,8 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import static org.joda.time.DateTimeZone.UTC; import google.registry.model.CreateAutoTimestamp; - -import org.joda.time.DateTime; - import java.util.Date; +import org.joda.time.DateTime; /** Saves {@link CreateAutoTimestamp} as either its value, or the current time if it was null. */ public class CreateAutoTimestampTranslatorFactory diff --git a/java/google/registry/model/translators/CurrencyUnitAdapter.java b/java/google/registry/model/translators/CurrencyUnitAdapter.java index 1dd161b38..4e0ec1c66 100644 --- a/java/google/registry/model/translators/CurrencyUnitAdapter.java +++ b/java/google/registry/model/translators/CurrencyUnitAdapter.java @@ -16,9 +16,8 @@ package google.registry.model.translators; import static com.google.common.base.Strings.nullToEmpty; -import org.joda.money.CurrencyUnit; - import javax.xml.bind.annotation.adapters.XmlAdapter; +import org.joda.money.CurrencyUnit; /** Adapter to use Joda {@link CurrencyUnit} when marshalling strings. */ public class CurrencyUnitAdapter extends XmlAdapter { diff --git a/java/google/registry/model/translators/ImmutableSortedMapTranslatorFactory.java b/java/google/registry/model/translators/ImmutableSortedMapTranslatorFactory.java index 4ca02de04..523b335e0 100644 --- a/java/google/registry/model/translators/ImmutableSortedMapTranslatorFactory.java +++ b/java/google/registry/model/translators/ImmutableSortedMapTranslatorFactory.java @@ -23,7 +23,6 @@ import static google.registry.util.CollectionUtils.nullToEmpty; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Ordering; import com.google.common.reflect.TypeToken; - import com.googlecode.objectify.impl.Node; import com.googlecode.objectify.impl.Path; import com.googlecode.objectify.impl.Property; @@ -35,10 +34,8 @@ import com.googlecode.objectify.impl.translate.SkipException; import com.googlecode.objectify.impl.translate.Translator; import com.googlecode.objectify.impl.translate.TranslatorFactory; import com.googlecode.objectify.impl.translate.TranslatorRegistry; - import java.lang.reflect.Type; import java.util.Map; - import javax.annotation.Nullable; /** diff --git a/java/google/registry/model/translators/InetAddressTranslatorFactory.java b/java/google/registry/model/translators/InetAddressTranslatorFactory.java index 4448ea889..3c3d6d6e1 100644 --- a/java/google/registry/model/translators/InetAddressTranslatorFactory.java +++ b/java/google/registry/model/translators/InetAddressTranslatorFactory.java @@ -15,7 +15,6 @@ package google.registry.model.translators; import com.google.common.net.InetAddresses; - import java.net.InetAddress; /** Stores {@link InetAddress} as a canonicalized string. */ diff --git a/java/google/registry/model/translators/ReadableInstantUtcTranslatorFactory.java b/java/google/registry/model/translators/ReadableInstantUtcTranslatorFactory.java index 3a30a0c81..ff2fcc054 100644 --- a/java/google/registry/model/translators/ReadableInstantUtcTranslatorFactory.java +++ b/java/google/registry/model/translators/ReadableInstantUtcTranslatorFactory.java @@ -23,13 +23,11 @@ import com.googlecode.objectify.impl.translate.SaveContext; import com.googlecode.objectify.impl.translate.ValueTranslator; import com.googlecode.objectify.impl.translate.ValueTranslatorFactory; import com.googlecode.objectify.repackaged.gentyref.GenericTypeReflector; - -import org.joda.time.DateTimeZone; -import org.joda.time.ReadableInstant; - import java.lang.reflect.Constructor; import java.lang.reflect.Type; import java.util.Date; +import org.joda.time.DateTimeZone; +import org.joda.time.ReadableInstant; /** * Stores Joda {@link ReadableInstant} types ({@code DateTime}, etc) as a {@link java.util.Date}. diff --git a/java/google/registry/model/translators/UpdateAutoTimestampTranslatorFactory.java b/java/google/registry/model/translators/UpdateAutoTimestampTranslatorFactory.java index e7ad586e4..2cd1ce225 100644 --- a/java/google/registry/model/translators/UpdateAutoTimestampTranslatorFactory.java +++ b/java/google/registry/model/translators/UpdateAutoTimestampTranslatorFactory.java @@ -18,10 +18,8 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import static org.joda.time.DateTimeZone.UTC; import google.registry.model.UpdateAutoTimestamp; - -import org.joda.time.DateTime; - import java.util.Date; +import org.joda.time.DateTime; /** Saves {@link UpdateAutoTimestamp} as the current time. */ public class UpdateAutoTimestampTranslatorFactory diff --git a/java/google/registry/module/backend/BackendComponent.java b/java/google/registry/module/backend/BackendComponent.java index d79e7e5fa..00d812546 100644 --- a/java/google/registry/module/backend/BackendComponent.java +++ b/java/google/registry/module/backend/BackendComponent.java @@ -15,7 +15,6 @@ package google.registry.module.backend; import dagger.Component; - import google.registry.bigquery.BigqueryModule; import google.registry.config.ConfigModule; import google.registry.dns.writer.api.VoidDnsWriterModule; @@ -40,7 +39,6 @@ import google.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModu import google.registry.request.RequestModule; import google.registry.util.SystemClock.SystemClockModule; import google.registry.util.SystemSleeper.SystemSleeperModule; - import javax.inject.Singleton; /** Dagger component with instance lifetime for "backend" App Engine module. */ diff --git a/java/google/registry/module/backend/BackendModule.java b/java/google/registry/module/backend/BackendModule.java index 162eb0463..ae1c6d05e 100644 --- a/java/google/registry/module/backend/BackendModule.java +++ b/java/google/registry/module/backend/BackendModule.java @@ -19,17 +19,13 @@ import static google.registry.request.RequestParameters.extractOptionalDatetimeP import static google.registry.request.RequestParameters.extractRequiredParameter; import com.google.common.base.Optional; - import dagger.Module; import dagger.Provides; - import google.registry.billing.ExpandRecurringBillingEventsAction; import google.registry.request.Parameter; import google.registry.request.RequestParameters; - -import org.joda.time.DateTime; - import javax.servlet.http.HttpServletRequest; +import org.joda.time.DateTime; /** * Dagger module for injecting common settings for all Backend tasks. diff --git a/java/google/registry/module/backend/BackendRequestComponent.java b/java/google/registry/module/backend/BackendRequestComponent.java index 6d4d90526..2d8039627 100644 --- a/java/google/registry/module/backend/BackendRequestComponent.java +++ b/java/google/registry/module/backend/BackendRequestComponent.java @@ -15,7 +15,6 @@ package google.registry.module.backend; import dagger.Subcomponent; - import google.registry.backup.BackupModule; import google.registry.backup.CommitLogCheckpointAction; import google.registry.backup.DeleteOldCommitLogsAction; diff --git a/java/google/registry/module/backend/BackendServlet.java b/java/google/registry/module/backend/BackendServlet.java index f4c29d053..7ffc18667 100644 --- a/java/google/registry/module/backend/BackendServlet.java +++ b/java/google/registry/module/backend/BackendServlet.java @@ -18,19 +18,15 @@ import static java.util.Arrays.asList; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; - import google.registry.request.RequestHandler; import google.registry.request.RequestModule; - -import org.bouncycastle.jce.provider.BouncyCastleProvider; - import java.io.IOException; import java.lang.reflect.Method; import java.security.Security; - import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.bouncycastle.jce.provider.BouncyCastleProvider; /** Servlet that should handle all requests to our "backend" App Engine module. */ public final class BackendServlet extends HttpServlet { diff --git a/java/google/registry/module/frontend/FrontendComponent.java b/java/google/registry/module/frontend/FrontendComponent.java index b7c160bf8..eb8879580 100644 --- a/java/google/registry/module/frontend/FrontendComponent.java +++ b/java/google/registry/module/frontend/FrontendComponent.java @@ -15,7 +15,6 @@ package google.registry.module.frontend; import dagger.Component; - import google.registry.braintree.BraintreeModule; import google.registry.config.ConfigModule; import google.registry.keyring.api.KeyModule; @@ -24,7 +23,6 @@ import google.registry.request.Modules.UserServiceModule; import google.registry.request.RequestModule; import google.registry.ui.ConsoleConfigModule; import google.registry.util.SystemClock.SystemClockModule; - import javax.inject.Singleton; /** Dagger component with instance lifetime for "default" App Engine module. */ diff --git a/java/google/registry/module/frontend/FrontendRequestComponent.java b/java/google/registry/module/frontend/FrontendRequestComponent.java index 695262c77..158922b1b 100644 --- a/java/google/registry/module/frontend/FrontendRequestComponent.java +++ b/java/google/registry/module/frontend/FrontendRequestComponent.java @@ -15,7 +15,6 @@ package google.registry.module.frontend; import dagger.Subcomponent; - import google.registry.flows.CheckApiAction; import google.registry.flows.CheckApiAction.CheckApiModule; import google.registry.flows.EppConsoleAction; diff --git a/java/google/registry/module/frontend/FrontendServlet.java b/java/google/registry/module/frontend/FrontendServlet.java index 1a889a30e..6cb5385d5 100644 --- a/java/google/registry/module/frontend/FrontendServlet.java +++ b/java/google/registry/module/frontend/FrontendServlet.java @@ -18,19 +18,15 @@ import static java.util.Arrays.asList; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; - import google.registry.request.RequestHandler; import google.registry.request.RequestModule; - -import org.bouncycastle.jce.provider.BouncyCastleProvider; - import java.io.IOException; import java.lang.reflect.Method; import java.security.Security; - import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.bouncycastle.jce.provider.BouncyCastleProvider; /** Servlet that should handle all requests to our "default" App Engine module. */ public final class FrontendServlet extends HttpServlet { diff --git a/java/google/registry/module/tools/ToolsComponent.java b/java/google/registry/module/tools/ToolsComponent.java index fffc1434b..735517251 100644 --- a/java/google/registry/module/tools/ToolsComponent.java +++ b/java/google/registry/module/tools/ToolsComponent.java @@ -15,7 +15,6 @@ package google.registry.module.tools; import dagger.Component; - import google.registry.config.ConfigModule; import google.registry.export.DriveModule; import google.registry.gcs.GcsServiceModule; @@ -33,7 +32,6 @@ import google.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModu import google.registry.request.RequestModule; import google.registry.util.SystemClock.SystemClockModule; import google.registry.util.SystemSleeper.SystemSleeperModule; - import javax.inject.Singleton; /** Dagger component with instance lifetime for "tools" App Engine module. */ diff --git a/java/google/registry/module/tools/ToolsRequestComponent.java b/java/google/registry/module/tools/ToolsRequestComponent.java index 34f9b02df..778fd055d 100644 --- a/java/google/registry/module/tools/ToolsRequestComponent.java +++ b/java/google/registry/module/tools/ToolsRequestComponent.java @@ -15,7 +15,6 @@ package google.registry.module.tools; import dagger.Subcomponent; - import google.registry.export.PublishDetailReportAction; import google.registry.flows.EppToolAction; import google.registry.flows.EppToolAction.EppToolModule; diff --git a/java/google/registry/module/tools/ToolsServlet.java b/java/google/registry/module/tools/ToolsServlet.java index e70e10dbf..fce3cf592 100644 --- a/java/google/registry/module/tools/ToolsServlet.java +++ b/java/google/registry/module/tools/ToolsServlet.java @@ -18,19 +18,15 @@ import static java.util.Arrays.asList; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; - import google.registry.request.RequestHandler; import google.registry.request.RequestModule; - -import org.bouncycastle.jce.provider.BouncyCastleProvider; - import java.io.IOException; import java.lang.reflect.Method; import java.security.Security; - import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.bouncycastle.jce.provider.BouncyCastleProvider; /** Servlet that should handle all requests to our "tools" App Engine module. */ public final class ToolsServlet extends HttpServlet { diff --git a/java/google/registry/monitoring/whitebox/EppMetrics.java b/java/google/registry/monitoring/whitebox/EppMetrics.java index e610aeb82..46482b607 100644 --- a/java/google/registry/monitoring/whitebox/EppMetrics.java +++ b/java/google/registry/monitoring/whitebox/EppMetrics.java @@ -18,11 +18,9 @@ import static com.google.apphosting.api.ApiProxy.getCurrentEnvironment; import com.google.api.services.bigquery.model.TableFieldSchema; import com.google.common.collect.ImmutableList; - import google.registry.bigquery.BigqueryUtils.FieldType; import google.registry.model.eppoutput.Result.Code; import google.registry.request.RequestScope; - import javax.inject.Inject; /** The EPP Metrics collector. See {@link Metrics}. */ diff --git a/java/google/registry/monitoring/whitebox/Metrics.java b/java/google/registry/monitoring/whitebox/Metrics.java index d462cb95a..b0d8e28a1 100644 --- a/java/google/registry/monitoring/whitebox/Metrics.java +++ b/java/google/registry/monitoring/whitebox/Metrics.java @@ -23,12 +23,10 @@ import com.google.appengine.api.modules.ModulesServiceFactory; import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TransientFailureException; import com.google.common.base.Supplier; - import google.registry.util.Clock; import google.registry.util.FormattingLogger; import google.registry.util.NonFinalForTesting; import google.registry.util.SystemClock; - import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; diff --git a/java/google/registry/monitoring/whitebox/MetricsExportAction.java b/java/google/registry/monitoring/whitebox/MetricsExportAction.java index 76d37346c..96f37d606 100644 --- a/java/google/registry/monitoring/whitebox/MetricsExportAction.java +++ b/java/google/registry/monitoring/whitebox/MetricsExportAction.java @@ -31,18 +31,15 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import google.registry.bigquery.BigqueryFactory; import google.registry.config.ConfigModule.Config; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.ParameterMap; import google.registry.util.FormattingLogger; - import java.io.IOException; import java.util.Map; import java.util.Set; - import javax.inject.Inject; /** Action for exporting metrics to BigQuery. */ diff --git a/java/google/registry/monitoring/whitebox/StackdriverModule.java b/java/google/registry/monitoring/whitebox/StackdriverModule.java index 8989a0bf3..7e55d9068 100644 --- a/java/google/registry/monitoring/whitebox/StackdriverModule.java +++ b/java/google/registry/monitoring/whitebox/StackdriverModule.java @@ -19,14 +19,11 @@ import com.google.api.client.http.HttpTransport; import com.google.api.client.json.JsonFactory; import com.google.api.services.monitoring.v3.Monitoring; import com.google.api.services.monitoring.v3.MonitoringScopes; - import dagger.Module; import dagger.Provides; import dagger.multibindings.ElementsIntoSet; - import google.registry.config.ConfigModule.Config; import google.registry.request.OAuthScopes; - import java.util.Set; /** Dagger module for Google Stackdriver service connection objects. */ diff --git a/java/google/registry/monitoring/whitebox/VerifyEntityIntegrityAction.java b/java/google/registry/monitoring/whitebox/VerifyEntityIntegrityAction.java index 6cf76c709..79d040d9a 100644 --- a/java/google/registry/monitoring/whitebox/VerifyEntityIntegrityAction.java +++ b/java/google/registry/monitoring/whitebox/VerifyEntityIntegrityAction.java @@ -38,10 +38,8 @@ import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.mapreduce.MapreduceRunner; import google.registry.mapreduce.inputs.EppResourceInputs; import google.registry.model.EppResource; @@ -63,18 +61,15 @@ import google.registry.request.Action; import google.registry.request.Response; import google.registry.util.FormattingLogger; import google.registry.util.NonFinalForTesting; - -import org.joda.time.DateTime; - import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; - import javax.annotation.Nullable; import javax.inject.Inject; +import org.joda.time.DateTime; /** * A mapreduce to verify integrity of entities in Datastore. diff --git a/java/google/registry/monitoring/whitebox/VerifyEntityIntegrityStreamer.java b/java/google/registry/monitoring/whitebox/VerifyEntityIntegrityStreamer.java index 9a6417827..4476983f6 100644 --- a/java/google/registry/monitoring/whitebox/VerifyEntityIntegrityStreamer.java +++ b/java/google/registry/monitoring/whitebox/VerifyEntityIntegrityStreamer.java @@ -36,19 +36,15 @@ import com.google.common.base.Supplier; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import google.registry.bigquery.BigqueryFactory; import google.registry.config.RegistryEnvironment; import google.registry.util.Retrier; - -import org.joda.time.DateTime; - import java.io.IOException; import java.util.List; import java.util.Map; import java.util.concurrent.Callable; - import javax.annotation.Nullable; +import org.joda.time.DateTime; /** * An injected utility class used to check entity integrity and stream violations to BigQuery. diff --git a/java/google/registry/monitoring/whitebox/WhiteboxComponent.java b/java/google/registry/monitoring/whitebox/WhiteboxComponent.java index a1e85be0d..191269347 100644 --- a/java/google/registry/monitoring/whitebox/WhiteboxComponent.java +++ b/java/google/registry/monitoring/whitebox/WhiteboxComponent.java @@ -15,12 +15,10 @@ package google.registry.monitoring.whitebox; import dagger.Component; - import google.registry.bigquery.BigqueryModule; import google.registry.config.ConfigModule; import google.registry.request.Modules.DatastoreServiceModule; import google.registry.util.SystemSleeper.SystemSleeperModule; - import javax.inject.Singleton; /** Dagger component with instance lifetime for Whitebox package. */ diff --git a/java/google/registry/monitoring/whitebox/WhiteboxModule.java b/java/google/registry/monitoring/whitebox/WhiteboxModule.java index b98684c53..6bd3f10ba 100644 --- a/java/google/registry/monitoring/whitebox/WhiteboxModule.java +++ b/java/google/registry/monitoring/whitebox/WhiteboxModule.java @@ -23,16 +23,12 @@ import static google.registry.request.RequestParameters.extractRequiredParameter import com.google.api.services.bigquery.model.TableFieldSchema; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; - import dagger.Module; import dagger.Provides; import dagger.multibindings.IntoMap; import dagger.multibindings.StringKey; - import google.registry.request.Parameter; - import java.util.UUID; - import javax.servlet.http.HttpServletRequest; /** diff --git a/java/google/registry/pricing/PricingComponent.java b/java/google/registry/pricing/PricingComponent.java index bdf72e0cb..a57f1e6a2 100644 --- a/java/google/registry/pricing/PricingComponent.java +++ b/java/google/registry/pricing/PricingComponent.java @@ -15,11 +15,8 @@ package google.registry.pricing; import dagger.Component; - import google.registry.model.pricing.PremiumPricingEngine; - import java.util.Map; - import javax.inject.Singleton; /** diff --git a/java/google/registry/pricing/PricingEngineProxy.java b/java/google/registry/pricing/PricingEngineProxy.java index 02cb46573..136521646 100644 --- a/java/google/registry/pricing/PricingEngineProxy.java +++ b/java/google/registry/pricing/PricingEngineProxy.java @@ -21,16 +21,13 @@ import static google.registry.util.DomainNameUtils.getTldFromDomainName; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; - import google.registry.model.pricing.PremiumPricingEngine; import google.registry.model.pricing.PremiumPricingEngine.DomainPrices; import google.registry.model.registry.Registry; - +import java.util.Map; import org.joda.money.Money; import org.joda.time.DateTime; -import java.util.Map; - /** * A global proxy providing static methods for getting premium prices that dispatches requests * correctly to the relevant {@link PremiumPricingEngine} implementation per TLD. diff --git a/java/google/registry/pricing/PricingModule.java b/java/google/registry/pricing/PricingModule.java index 0310b7ec1..36f1e92f0 100644 --- a/java/google/registry/pricing/PricingModule.java +++ b/java/google/registry/pricing/PricingModule.java @@ -18,7 +18,6 @@ import dagger.MapKey; import dagger.Module; import dagger.Provides; import dagger.multibindings.IntoMap; - import google.registry.model.pricing.PremiumPricingEngine; import google.registry.model.pricing.StaticPremiumListPricingEngine; diff --git a/java/google/registry/pricing/TldSpecificLogicProxy.java b/java/google/registry/pricing/TldSpecificLogicProxy.java index 3ffbf2984..ef80e69df 100644 --- a/java/google/registry/pricing/TldSpecificLogicProxy.java +++ b/java/google/registry/pricing/TldSpecificLogicProxy.java @@ -21,13 +21,11 @@ import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; - import google.registry.model.ImmutableObject; import google.registry.model.domain.fee.EapFee; import google.registry.model.domain.fee.Fee; import google.registry.model.pricing.PremiumPricingEngine.DomainPrices; import google.registry.model.registry.Registry; - import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/java/google/registry/rdap/RdapActionBase.java b/java/google/registry/rdap/RdapActionBase.java index 427246563..c4acefbec 100644 --- a/java/google/registry/rdap/RdapActionBase.java +++ b/java/google/registry/rdap/RdapActionBase.java @@ -30,9 +30,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.net.InternetDomainName; import com.google.common.net.MediaType; import com.google.re2j.Pattern; - import com.googlecode.objectify.cmd.Query; - import google.registry.config.ConfigModule.Config; import google.registry.model.EppResource; import google.registry.request.Action; @@ -43,13 +41,10 @@ import google.registry.request.RequestMethod; import google.registry.request.RequestPath; import google.registry.request.Response; import google.registry.util.FormattingLogger; - -import org.json.simple.JSONValue; - import java.net.URI; import java.net.URISyntaxException; - import javax.inject.Inject; +import org.json.simple.JSONValue; /** * Base RDAP (new WHOIS) action for single-item domain, nameserver and entity requests. diff --git a/java/google/registry/rdap/RdapAutnumAction.java b/java/google/registry/rdap/RdapAutnumAction.java index f5e3974c7..15e22a68e 100644 --- a/java/google/registry/rdap/RdapAutnumAction.java +++ b/java/google/registry/rdap/RdapAutnumAction.java @@ -18,11 +18,9 @@ import static google.registry.request.Action.Method.GET; import static google.registry.request.Action.Method.HEAD; import com.google.common.collect.ImmutableMap; - import google.registry.request.Action; import google.registry.request.HttpException; import google.registry.request.HttpException.NotImplementedException; - import javax.inject.Inject; /** diff --git a/java/google/registry/rdap/RdapDomainAction.java b/java/google/registry/rdap/RdapDomainAction.java index 89f89fbfd..95966d4cd 100644 --- a/java/google/registry/rdap/RdapDomainAction.java +++ b/java/google/registry/rdap/RdapDomainAction.java @@ -19,13 +19,11 @@ import static google.registry.request.Action.Method.GET; import static google.registry.request.Action.Method.HEAD; import com.google.common.collect.ImmutableMap; - import google.registry.model.domain.DomainResource; import google.registry.request.Action; import google.registry.request.HttpException; import google.registry.request.HttpException.NotFoundException; import google.registry.util.Clock; - import javax.inject.Inject; /** diff --git a/java/google/registry/rdap/RdapDomainSearchAction.java b/java/google/registry/rdap/RdapDomainSearchAction.java index d01fca3ee..fea32f684 100644 --- a/java/google/registry/rdap/RdapDomainSearchAction.java +++ b/java/google/registry/rdap/RdapDomainSearchAction.java @@ -27,12 +27,10 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Iterables; import com.google.common.primitives.Booleans; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; import com.googlecode.objectify.cmd.Query; import com.googlecode.objectify.cmd.QueryKeys; - import google.registry.model.domain.DomainResource; import google.registry.model.host.HostResource; import google.registry.rdap.RdapJsonFormatter.BoilerplateType; @@ -43,13 +41,10 @@ import google.registry.request.HttpException.NotFoundException; import google.registry.request.Parameter; import google.registry.util.Clock; import google.registry.util.Idn; - -import org.joda.time.DateTime; - import java.net.InetAddress; import java.util.List; - import javax.inject.Inject; +import org.joda.time.DateTime; /** * RDAP (new WHOIS) action for domain search requests. diff --git a/java/google/registry/rdap/RdapEntityAction.java b/java/google/registry/rdap/RdapEntityAction.java index fafb1c262..c411e5320 100644 --- a/java/google/registry/rdap/RdapEntityAction.java +++ b/java/google/registry/rdap/RdapEntityAction.java @@ -21,9 +21,7 @@ import static google.registry.request.Action.Method.HEAD; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.re2j.Pattern; - import com.googlecode.objectify.Key; - import google.registry.model.contact.ContactResource; import google.registry.model.domain.DesignatedContact; import google.registry.model.registrar.Registrar; @@ -32,7 +30,6 @@ import google.registry.request.HttpException; import google.registry.request.HttpException.BadRequestException; import google.registry.request.HttpException.NotFoundException; import google.registry.util.Clock; - import javax.inject.Inject; /** diff --git a/java/google/registry/rdap/RdapEntitySearchAction.java b/java/google/registry/rdap/RdapEntitySearchAction.java index a7259d30d..62cf6ecb6 100644 --- a/java/google/registry/rdap/RdapEntitySearchAction.java +++ b/java/google/registry/rdap/RdapEntitySearchAction.java @@ -23,10 +23,8 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.primitives.Booleans; - import com.googlecode.objectify.Key; import com.googlecode.objectify.cmd.Query; - import google.registry.config.ConfigModule.Config; import google.registry.model.contact.ContactResource; import google.registry.model.domain.DesignatedContact; @@ -40,7 +38,6 @@ import google.registry.request.HttpException.NotImplementedException; import google.registry.request.HttpException.UnprocessableEntityException; import google.registry.request.Parameter; import google.registry.util.Clock; - import javax.inject.Inject; /** diff --git a/java/google/registry/rdap/RdapHelpAction.java b/java/google/registry/rdap/RdapHelpAction.java index ce3594e91..70d2ed632 100644 --- a/java/google/registry/rdap/RdapHelpAction.java +++ b/java/google/registry/rdap/RdapHelpAction.java @@ -19,7 +19,6 @@ import static google.registry.request.Action.Method.HEAD; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import google.registry.rdap.RdapJsonFormatter.BoilerplateType; import google.registry.rdap.RdapJsonFormatter.MakeRdapJsonNoticeParameters; import google.registry.request.Action; @@ -27,7 +26,6 @@ import google.registry.request.HttpException; import google.registry.request.HttpException.InternalServerErrorException; import google.registry.request.HttpException.NotFoundException; import google.registry.util.Clock; - import javax.inject.Inject; /** diff --git a/java/google/registry/rdap/RdapIpAction.java b/java/google/registry/rdap/RdapIpAction.java index 1222b1866..0e4293f3c 100644 --- a/java/google/registry/rdap/RdapIpAction.java +++ b/java/google/registry/rdap/RdapIpAction.java @@ -18,11 +18,9 @@ import static google.registry.request.Action.Method.GET; import static google.registry.request.Action.Method.HEAD; import com.google.common.collect.ImmutableMap; - import google.registry.request.Action; import google.registry.request.HttpException; import google.registry.request.HttpException.NotImplementedException; - import javax.inject.Inject; /** diff --git a/java/google/registry/rdap/RdapJsonFormatter.java b/java/google/registry/rdap/RdapJsonFormatter.java index 8e7e81cbd..d439b8d02 100644 --- a/java/google/registry/rdap/RdapJsonFormatter.java +++ b/java/google/registry/rdap/RdapJsonFormatter.java @@ -28,9 +28,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; import com.google.common.net.InetAddresses; - import com.googlecode.objectify.Key; - import google.registry.model.EppResource; import google.registry.model.contact.ContactPhoneNumber; import google.registry.model.contact.ContactResource; @@ -46,17 +44,14 @@ import google.registry.model.registrar.RegistrarAddress; import google.registry.model.registrar.RegistrarContact; import google.registry.model.reporting.HistoryEntry; import google.registry.util.Idn; - -import org.joda.time.DateTime; - import java.net.Inet4Address; import java.net.Inet6Address; import java.net.InetAddress; import java.net.URI; import java.util.Locale; import java.util.Map; - import javax.annotation.Nullable; +import org.joda.time.DateTime; /** * Helper class to create RDAP JSON objects for various registry entities and objects. diff --git a/java/google/registry/rdap/RdapModule.java b/java/google/registry/rdap/RdapModule.java index bd34780da..1a3557679 100644 --- a/java/google/registry/rdap/RdapModule.java +++ b/java/google/registry/rdap/RdapModule.java @@ -15,15 +15,11 @@ package google.registry.rdap; import com.google.common.base.Optional; - import dagger.Module; import dagger.Provides; - import google.registry.request.Parameter; import google.registry.request.RequestParameters; - import java.net.InetAddress; - import javax.servlet.http.HttpServletRequest; /** Dagger module for the RDAP package. */ diff --git a/java/google/registry/rdap/RdapNameserverAction.java b/java/google/registry/rdap/RdapNameserverAction.java index 877ed075a..095d599ee 100644 --- a/java/google/registry/rdap/RdapNameserverAction.java +++ b/java/google/registry/rdap/RdapNameserverAction.java @@ -19,13 +19,11 @@ import static google.registry.request.Action.Method.GET; import static google.registry.request.Action.Method.HEAD; import com.google.common.collect.ImmutableMap; - import google.registry.model.host.HostResource; import google.registry.request.Action; import google.registry.request.HttpException; import google.registry.request.HttpException.NotFoundException; import google.registry.util.Clock; - import javax.inject.Inject; /** diff --git a/java/google/registry/rdap/RdapNameserverSearchAction.java b/java/google/registry/rdap/RdapNameserverSearchAction.java index bb3bdbac9..b6a9eb196 100644 --- a/java/google/registry/rdap/RdapNameserverSearchAction.java +++ b/java/google/registry/rdap/RdapNameserverSearchAction.java @@ -25,9 +25,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedSet; import com.google.common.primitives.Booleans; - import com.googlecode.objectify.cmd.Query; - import google.registry.config.ConfigModule.Config; import google.registry.model.domain.DomainResource; import google.registry.model.host.HostResource; @@ -39,12 +37,9 @@ import google.registry.request.HttpException.NotFoundException; import google.registry.request.Parameter; import google.registry.util.Clock; import google.registry.util.Idn; - -import org.joda.time.DateTime; - import java.net.InetAddress; - import javax.inject.Inject; +import org.joda.time.DateTime; /** * RDAP (new WHOIS) action for nameserver search requests. diff --git a/java/google/registry/rdap/RdapSearchPattern.java b/java/google/registry/rdap/RdapSearchPattern.java index 6fda4cc68..23cc077b8 100644 --- a/java/google/registry/rdap/RdapSearchPattern.java +++ b/java/google/registry/rdap/RdapSearchPattern.java @@ -15,7 +15,6 @@ package google.registry.rdap; import google.registry.request.HttpException.UnprocessableEntityException; - import javax.annotation.Nullable; /** diff --git a/java/google/registry/rde/BrdaCopyAction.java b/java/google/registry/rde/BrdaCopyAction.java index e960e9bd3..b4ddfe50c 100644 --- a/java/google/registry/rde/BrdaCopyAction.java +++ b/java/google/registry/rde/BrdaCopyAction.java @@ -20,7 +20,6 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.common.io.ByteStreams; - import google.registry.config.ConfigModule.Config; import google.registry.gcs.GcsUtils; import google.registry.keyring.api.KeyModule.Key; @@ -29,20 +28,17 @@ import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.RequestParameters; import google.registry.util.FormattingLogger; - +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import javax.inject.Inject; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPrivateKey; import org.bouncycastle.openpgp.PGPPublicKey; import org.joda.time.DateTime; -import java.io.BufferedInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import javax.inject.Inject; - /** * Action that re-encrypts a BRDA escrow deposit and puts it into the upload bucket. * diff --git a/java/google/registry/rde/ContactResourceToXjcConverter.java b/java/google/registry/rde/ContactResourceToXjcConverter.java index ed3fa830a..6b68c1e94 100644 --- a/java/google/registry/rde/ContactResourceToXjcConverter.java +++ b/java/google/registry/rde/ContactResourceToXjcConverter.java @@ -36,7 +36,6 @@ import google.registry.xjc.eppcom.XjcEppcomTrStatusType; import google.registry.xjc.rdecontact.XjcRdeContact; import google.registry.xjc.rdecontact.XjcRdeContactElement; import google.registry.xjc.rdecontact.XjcRdeContactTransferDataType; - import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/java/google/registry/rde/DepositFragment.java b/java/google/registry/rde/DepositFragment.java index 5d07b0657..722b458b5 100644 --- a/java/google/registry/rde/DepositFragment.java +++ b/java/google/registry/rde/DepositFragment.java @@ -15,7 +15,6 @@ package google.registry.rde; import com.google.auto.value.AutoValue; - import java.io.Serializable; /** Container of datastore resource marshalled by {@link RdeMarshaller}. */ diff --git a/java/google/registry/rde/DomainResourceToXjcConverter.java b/java/google/registry/rde/DomainResourceToXjcConverter.java index 331b98eb6..921decf08 100644 --- a/java/google/registry/rde/DomainResourceToXjcConverter.java +++ b/java/google/registry/rde/DomainResourceToXjcConverter.java @@ -16,9 +16,7 @@ package google.registry.rde; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Ref; - import google.registry.model.contact.ContactResource; import google.registry.model.domain.DesignatedContact; import google.registry.model.domain.DomainResource; @@ -42,7 +40,6 @@ import google.registry.xjc.rgp.XjcRgpStatusType; import google.registry.xjc.rgp.XjcRgpStatusValueType; import google.registry.xjc.secdns.XjcSecdnsDsDataType; import google.registry.xjc.secdns.XjcSecdnsDsOrKeyType; - import org.joda.time.DateTime; /** Utility class that turns {@link DomainResource} as {@link XjcRdeDomainElement}. */ diff --git a/java/google/registry/rde/EscrowTaskRunner.java b/java/google/registry/rde/EscrowTaskRunner.java index 625852675..caaf2557d 100644 --- a/java/google/registry/rde/EscrowTaskRunner.java +++ b/java/google/registry/rde/EscrowTaskRunner.java @@ -17,7 +17,6 @@ package google.registry.rde; import static google.registry.model.ofy.ObjectifyService.ofy; import com.googlecode.objectify.VoidWork; - import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; import google.registry.model.registry.Registry; @@ -28,14 +27,11 @@ import google.registry.request.Parameter; import google.registry.request.RequestParameters; import google.registry.util.Clock; import google.registry.util.FormattingLogger; - +import java.util.concurrent.Callable; +import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; -import java.util.concurrent.Callable; - -import javax.inject.Inject; - /** * Runner applying guaranteed reliability to an {@link EscrowTask}. * diff --git a/java/google/registry/rde/Ghostryde.java b/java/google/registry/rde/Ghostryde.java index e78492ee3..0305aba68 100644 --- a/java/google/registry/rde/Ghostryde.java +++ b/java/google/registry/rde/Ghostryde.java @@ -24,12 +24,25 @@ import static org.bouncycastle.openpgp.PGPLiteralData.BINARY; import static org.joda.time.DateTimeZone.UTC; import com.google.common.io.ByteStreams; - import google.registry.config.ConfigModule.Config; import google.registry.util.FormattingLogger; import google.registry.util.ImprovedInputStream; import google.registry.util.ImprovedOutputStream; - +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.security.NoSuchAlgorithmException; +import java.security.ProviderException; +import java.security.SecureRandom; +import javax.annotation.CheckReturnValue; +import javax.annotation.Nullable; +import javax.annotation.WillCloseWhenClosed; +import javax.annotation.WillNotClose; +import javax.annotation.concurrent.Immutable; +import javax.annotation.concurrent.NotThreadSafe; +import javax.inject.Inject; import org.bouncycastle.openpgp.PGPCompressedData; import org.bouncycastle.openpgp.PGPCompressedDataGenerator; import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; @@ -47,23 +60,6 @@ import org.bouncycastle.openpgp.operator.bc.BcPublicKeyKeyEncryptionMethodGenera import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; import org.joda.time.DateTime; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.security.NoSuchAlgorithmException; -import java.security.ProviderException; -import java.security.SecureRandom; - -import javax.annotation.CheckReturnValue; -import javax.annotation.Nullable; -import javax.annotation.WillCloseWhenClosed; -import javax.annotation.WillNotClose; -import javax.annotation.concurrent.Immutable; -import javax.annotation.concurrent.NotThreadSafe; -import javax.inject.Inject; - /** * Utility class for reading and writing data in the ghostryde container format. * diff --git a/java/google/registry/rde/HostResourceToXjcConverter.java b/java/google/registry/rde/HostResourceToXjcConverter.java index 8542df90e..67a8d749d 100644 --- a/java/google/registry/rde/HostResourceToXjcConverter.java +++ b/java/google/registry/rde/HostResourceToXjcConverter.java @@ -15,7 +15,6 @@ package google.registry.rde; import com.google.common.net.InetAddresses; - import google.registry.model.eppcommon.StatusValue; import google.registry.model.host.HostResource; import google.registry.xjc.host.XjcHostAddrType; @@ -24,7 +23,6 @@ import google.registry.xjc.host.XjcHostStatusType; import google.registry.xjc.host.XjcHostStatusValueType; import google.registry.xjc.rdehost.XjcRdeHost; import google.registry.xjc.rdehost.XjcRdeHostElement; - import java.net.Inet6Address; import java.net.InetAddress; diff --git a/java/google/registry/rde/JSchModule.java b/java/google/registry/rde/JSchModule.java index 21f8c88d3..b31379257 100644 --- a/java/google/registry/rde/JSchModule.java +++ b/java/google/registry/rde/JSchModule.java @@ -17,13 +17,10 @@ package google.registry.rde; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.appengine.api.ThreadManager; - import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; - import dagger.Module; import dagger.Provides; - import google.registry.keyring.api.KeyModule.Key; /** Dagger module for {@link JSch} which provides SSH/SFTP connectivity. */ diff --git a/java/google/registry/rde/JSchSftpChannel.java b/java/google/registry/rde/JSchSftpChannel.java index 7edcf4a3f..c86cfe70b 100644 --- a/java/google/registry/rde/JSchSftpChannel.java +++ b/java/google/registry/rde/JSchSftpChannel.java @@ -17,7 +17,6 @@ package google.registry.rde; import static com.google.common.base.Preconditions.checkNotNull; import com.jcraft.jsch.ChannelSftp; - import java.io.Closeable; import java.io.IOException; diff --git a/java/google/registry/rde/JSchSshSession.java b/java/google/registry/rde/JSchSshSession.java index 360ddfaea..2b5bb7c69 100644 --- a/java/google/registry/rde/JSchSshSession.java +++ b/java/google/registry/rde/JSchSshSession.java @@ -15,23 +15,18 @@ package google.registry.rde; import com.google.common.base.Splitter; - import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; import com.jcraft.jsch.Session; import com.jcraft.jsch.SftpException; - import google.registry.config.ConfigModule.Config; import google.registry.util.FormattingLogger; - -import org.joda.time.Duration; - import java.io.Closeable; import java.io.IOException; import java.net.URI; - import javax.inject.Inject; +import org.joda.time.Duration; /** * SFTP connection {@link Session} delegate that implements {@link Closeable}. diff --git a/java/google/registry/rde/PendingDeposit.java b/java/google/registry/rde/PendingDeposit.java index a21a9cca1..c29d5e882 100644 --- a/java/google/registry/rde/PendingDeposit.java +++ b/java/google/registry/rde/PendingDeposit.java @@ -15,15 +15,12 @@ package google.registry.rde; import com.google.auto.value.AutoValue; - import google.registry.model.common.Cursor.CursorType; import google.registry.model.rde.RdeMode; - +import java.io.Serializable; import org.joda.time.DateTime; import org.joda.time.Duration; -import java.io.Serializable; - /** Container representing a single RDE or BRDA XML escrow deposit that needs to be created. */ @AutoValue public abstract class PendingDeposit implements Serializable { diff --git a/java/google/registry/rde/PendingDepositChecker.java b/java/google/registry/rde/PendingDepositChecker.java index 8800afcf0..c8002591d 100644 --- a/java/google/registry/rde/PendingDepositChecker.java +++ b/java/google/registry/rde/PendingDepositChecker.java @@ -19,9 +19,7 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.util.DateTimeUtils.isBeforeOrAt; import com.google.common.collect.ImmutableSetMultimap; - import com.googlecode.objectify.Work; - import google.registry.config.ConfigModule.Config; import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; @@ -30,12 +28,10 @@ import google.registry.model.registry.Registries; import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.TldType; import google.registry.util.Clock; - +import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; -import javax.inject.Inject; - /** * Utility class that determines which RDE or BRDA deposits need to be created. * diff --git a/java/google/registry/rde/RdeAdapter.java b/java/google/registry/rde/RdeAdapter.java index b8e006803..f7e533cfb 100644 --- a/java/google/registry/rde/RdeAdapter.java +++ b/java/google/registry/rde/RdeAdapter.java @@ -18,7 +18,6 @@ import static com.google.common.base.Strings.emptyToNull; import static com.google.common.base.Strings.isNullOrEmpty; import google.registry.xjc.rde.XjcRdeRrType; - import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/java/google/registry/rde/RdeCounter.java b/java/google/registry/rde/RdeCounter.java index b485d9dcf..a3d4d5bc3 100644 --- a/java/google/registry/rde/RdeCounter.java +++ b/java/google/registry/rde/RdeCounter.java @@ -24,15 +24,12 @@ import google.registry.xjc.rdeheader.XjcRdeHeader; import google.registry.xjc.rdeheader.XjcRdeHeaderCount; import google.registry.xjc.rdeheader.XjcRdeHeaderElement; import google.registry.xjc.rdereport.XjcRdeReport; - -import org.joda.time.DateTime; - import java.util.EnumMap; import java.util.EnumSet; import java.util.concurrent.atomic.AtomicLong; - import javax.annotation.concurrent.NotThreadSafe; import javax.inject.Inject; +import org.joda.time.DateTime; /** Utility class for generating a single {@link XjcRdeHeader} while marshalling a deposit. */ @NotThreadSafe diff --git a/java/google/registry/rde/RdeMarshaller.java b/java/google/registry/rde/RdeMarshaller.java index ba1982a63..1b8b062b9 100644 --- a/java/google/registry/rde/RdeMarshaller.java +++ b/java/google/registry/rde/RdeMarshaller.java @@ -18,7 +18,6 @@ import static com.google.common.base.Verify.verify; import static java.nio.charset.StandardCharsets.UTF_8; import com.googlecode.objectify.Key; - import google.registry.model.ImmutableObject; import google.registry.model.contact.ContactResource; import google.registry.model.domain.DomainResource; @@ -38,16 +37,13 @@ import google.registry.xjc.rdepolicy.XjcRdePolicy; import google.registry.xjc.rdepolicy.XjcRdePolicyElement; import google.registry.xml.XmlException; import google.registry.xml.XmlFragmentMarshaller; - -import org.joda.time.DateTime; - import java.io.ByteArrayOutputStream; import java.io.Serializable; import java.util.Collection; - import javax.annotation.concurrent.NotThreadSafe; import javax.xml.bind.JAXBElement; import javax.xml.bind.MarshalException; +import org.joda.time.DateTime; /** XML document fragment marshaller for RDE. */ @NotThreadSafe diff --git a/java/google/registry/rde/RdeModule.java b/java/google/registry/rde/RdeModule.java index ffcf0f5f4..6b31be4cd 100644 --- a/java/google/registry/rde/RdeModule.java +++ b/java/google/registry/rde/RdeModule.java @@ -17,17 +17,13 @@ package google.registry.rde; import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; import com.google.appengine.api.taskqueue.Queue; - import dagger.Module; import dagger.Provides; - import google.registry.request.Parameter; import google.registry.request.RequestParameters; - -import org.joda.time.DateTime; - import javax.inject.Named; import javax.servlet.http.HttpServletRequest; +import org.joda.time.DateTime; /** * Dagger module for RDE package. diff --git a/java/google/registry/rde/RdeParser.java b/java/google/registry/rde/RdeParser.java index 6acc39632..2a873d311 100644 --- a/java/google/registry/rde/RdeParser.java +++ b/java/google/registry/rde/RdeParser.java @@ -19,7 +19,6 @@ import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; - import google.registry.xjc.XjcXmlTransformer; import google.registry.xjc.rdecontact.XjcRdeContact; import google.registry.xjc.rdecontact.XjcRdeContactElement; @@ -38,11 +37,9 @@ import google.registry.xjc.rdenndn.XjcRdeNndn; import google.registry.xjc.rdenndn.XjcRdeNndnElement; import google.registry.xjc.rderegistrar.XjcRdeRegistrar; import google.registry.xjc.rderegistrar.XjcRdeRegistrarElement; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; - import javax.annotation.concurrent.NotThreadSafe; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; diff --git a/java/google/registry/rde/RdeReportAction.java b/java/google/registry/rde/RdeReportAction.java index 0e18711ce..6f2096a49 100644 --- a/java/google/registry/rde/RdeReportAction.java +++ b/java/google/registry/rde/RdeReportAction.java @@ -23,7 +23,6 @@ import static google.registry.request.Action.Method.POST; import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.common.io.ByteStreams; - import google.registry.config.ConfigModule.Config; import google.registry.gcs.GcsUtils; import google.registry.keyring.api.KeyModule.Key; @@ -38,17 +37,14 @@ import google.registry.request.Parameter; import google.registry.request.RequestParameters; import google.registry.request.Response; import google.registry.util.FormattingLogger; - +import java.io.IOException; +import java.io.InputStream; +import javax.inject.Inject; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPrivateKey; import org.joda.time.DateTime; import org.joda.time.Duration; -import java.io.IOException; -import java.io.InputStream; - -import javax.inject.Inject; - /** * Action that uploads a small XML RDE report to ICANN after {@link RdeUploadAction} has finished. */ diff --git a/java/google/registry/rde/RdeReporter.java b/java/google/registry/rde/RdeReporter.java index d40ecbc73..dc2ae1263 100644 --- a/java/google/registry/rde/RdeReporter.java +++ b/java/google/registry/rde/RdeReporter.java @@ -28,7 +28,6 @@ import com.google.appengine.api.urlfetch.HTTPHeader; import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.appengine.api.urlfetch.URLFetchService; - import google.registry.config.ConfigModule.Config; import google.registry.config.RegistryConfig; import google.registry.keyring.api.KeyModule.Key; @@ -41,12 +40,10 @@ import google.registry.xjc.iirdea.XjcIirdeaResult; import google.registry.xjc.rdeheader.XjcRdeHeader; import google.registry.xjc.rdereport.XjcRdeReportReport; import google.registry.xml.XmlException; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; - import javax.inject.Inject; /** diff --git a/java/google/registry/rde/RdeResourceType.java b/java/google/registry/rde/RdeResourceType.java index 8dcf67137..479f333d3 100644 --- a/java/google/registry/rde/RdeResourceType.java +++ b/java/google/registry/rde/RdeResourceType.java @@ -19,9 +19,7 @@ import static google.registry.model.rde.RdeMode.THIN; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Ordering; - import google.registry.model.rde.RdeMode; - import java.util.Collections; import java.util.EnumSet; import java.util.Set; diff --git a/java/google/registry/rde/RdeStagingAction.java b/java/google/registry/rde/RdeStagingAction.java index 1a0bb4dac..6c7803e12 100644 --- a/java/google/registry/rde/RdeStagingAction.java +++ b/java/google/registry/rde/RdeStagingAction.java @@ -21,7 +21,6 @@ import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSetMultimap; import com.google.common.collect.Multimaps; - import google.registry.config.ConfigModule.Config; import google.registry.mapreduce.MapreduceRunner; import google.registry.mapreduce.inputs.EppResourceInputs; @@ -38,10 +37,8 @@ import google.registry.request.Action; import google.registry.request.Response; import google.registry.util.Clock; import google.registry.util.FormattingLogger; - -import org.joda.time.Duration; - import javax.inject.Inject; +import org.joda.time.Duration; /** * MapReduce that idempotently stages escrow deposit XML files on GCS for RDE/BRDA for all TLDs. diff --git a/java/google/registry/rde/RdeStagingMapper.java b/java/google/registry/rde/RdeStagingMapper.java index 1636068a4..b332e2ffb 100644 --- a/java/google/registry/rde/RdeStagingMapper.java +++ b/java/google/registry/rde/RdeStagingMapper.java @@ -26,9 +26,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSetMultimap; import com.google.common.collect.Maps; - import com.googlecode.objectify.Result; - import google.registry.model.EppResource; import google.registry.model.EppResourceUtils; import google.registry.model.contact.ContactResource; @@ -36,11 +34,9 @@ import google.registry.model.domain.DomainResource; import google.registry.model.host.HostResource; import google.registry.model.rde.RdeMode; import google.registry.model.registrar.Registrar; - -import org.joda.time.DateTime; - import java.util.HashMap; import java.util.Map; +import org.joda.time.DateTime; /** Mapper for {@link RdeStagingAction}. */ public final class RdeStagingMapper extends Mapper { diff --git a/java/google/registry/rde/RdeStagingReducer.java b/java/google/registry/rde/RdeStagingReducer.java index 924740a49..48c76c4d0 100644 --- a/java/google/registry/rde/RdeStagingReducer.java +++ b/java/google/registry/rde/RdeStagingReducer.java @@ -27,9 +27,7 @@ import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.appengine.tools.cloudstorage.RetryParams; import com.google.appengine.tools.mapreduce.Reducer; import com.google.appengine.tools.mapreduce.ReducerInput; - import com.googlecode.objectify.VoidWork; - import google.registry.config.ConfigModule.Config; import google.registry.gcs.GcsUtils; import google.registry.keyring.api.KeyModule; @@ -47,13 +45,6 @@ import google.registry.util.TaskEnqueuer; import google.registry.xjc.rdeheader.XjcRdeHeader; import google.registry.xjc.rdeheader.XjcRdeHeaderElement; import google.registry.xml.XmlException; - -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.joda.time.DateTime; -import org.joda.time.Duration; - import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; @@ -61,8 +52,12 @@ import java.io.Writer; import java.security.Security; import java.util.Iterator; import java.util.concurrent.Callable; - import javax.inject.Inject; +import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.bouncycastle.openpgp.PGPException; +import org.bouncycastle.openpgp.PGPPublicKey; +import org.joda.time.DateTime; +import org.joda.time.Duration; /** Reducer for {@link RdeStagingAction}. */ public final class RdeStagingReducer extends Reducer { diff --git a/java/google/registry/rde/RdeUploadAction.java b/java/google/registry/rde/RdeUploadAction.java index c4b936204..7179451b1 100644 --- a/java/google/registry/rde/RdeUploadAction.java +++ b/java/google/registry/rde/RdeUploadAction.java @@ -28,10 +28,8 @@ import static java.util.Arrays.asList; import com.google.appengine.api.taskqueue.Queue; import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.common.io.ByteStreams; - import com.googlecode.objectify.VoidWork; import com.jcraft.jsch.JSch; - import google.registry.config.ConfigModule.Config; import google.registry.gcs.GcsUtils; import google.registry.keyring.api.KeyModule.Key; @@ -51,21 +49,18 @@ import google.registry.util.Clock; import google.registry.util.FormattingLogger; import google.registry.util.TaskEnqueuer; import google.registry.util.TeeOutputStream; - -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.joda.time.DateTime; -import org.joda.time.Duration; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.URI; - import javax.inject.Inject; import javax.inject.Named; +import org.bouncycastle.openpgp.PGPKeyPair; +import org.bouncycastle.openpgp.PGPPrivateKey; +import org.bouncycastle.openpgp.PGPPublicKey; +import org.joda.time.DateTime; +import org.joda.time.Duration; /** * Action that securely uploads an RDE XML file from Cloud Storage to a trusted third party (such as diff --git a/java/google/registry/rde/RdeUploadUrl.java b/java/google/registry/rde/RdeUploadUrl.java index 051c01ccd..fa1ee24a8 100644 --- a/java/google/registry/rde/RdeUploadUrl.java +++ b/java/google/registry/rde/RdeUploadUrl.java @@ -20,13 +20,11 @@ import static com.google.common.base.Strings.isNullOrEmpty; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; - import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URLEncoder; import java.util.Map; import java.util.Objects; - import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/java/google/registry/rde/RdeUtil.java b/java/google/registry/rde/RdeUtil.java index 90b0dbf4b..24cf9914d 100644 --- a/java/google/registry/rde/RdeUtil.java +++ b/java/google/registry/rde/RdeUtil.java @@ -20,19 +20,16 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.io.BaseEncoding; import com.google.re2j.Matcher; import com.google.re2j.Pattern; - import google.registry.xjc.rde.XjcRdeRrType; import google.registry.xml.XmlException; - +import java.io.BufferedInputStream; +import java.io.IOException; +import java.nio.ByteBuffer; import org.joda.time.DateTime; import org.joda.time.ReadableInstant; import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.ISODateTimeFormat; -import java.io.BufferedInputStream; -import java.io.IOException; -import java.nio.ByteBuffer; - /** Helper methods for RDE. */ public final class RdeUtil { diff --git a/java/google/registry/rde/RegistrarToXjcConverter.java b/java/google/registry/rde/RegistrarToXjcConverter.java index f81566fd3..fa0517860 100644 --- a/java/google/registry/rde/RegistrarToXjcConverter.java +++ b/java/google/registry/rde/RegistrarToXjcConverter.java @@ -26,7 +26,6 @@ import google.registry.xjc.rderegistrar.XjcRdeRegistrarPostalInfoEnumType; import google.registry.xjc.rderegistrar.XjcRdeRegistrarPostalInfoType; import google.registry.xjc.rderegistrar.XjcRdeRegistrarStatusType; import google.registry.xjc.rderegistrar.XjcRdeRegistrarWhoisInfoType; - import java.math.BigInteger; /** Utility class that turns {@link Registrar} as {@link XjcRdeRegistrarElement}. */ diff --git a/java/google/registry/rde/RydePgpCompressionOutputStream.java b/java/google/registry/rde/RydePgpCompressionOutputStream.java index efdc2894f..1922305a4 100644 --- a/java/google/registry/rde/RydePgpCompressionOutputStream.java +++ b/java/google/registry/rde/RydePgpCompressionOutputStream.java @@ -18,17 +18,13 @@ import static org.bouncycastle.bcpg.CompressionAlgorithmTags.ZIP; import com.google.auto.factory.AutoFactory; import com.google.auto.factory.Provided; - import google.registry.config.ConfigModule.Config; import google.registry.util.ImprovedOutputStream; - -import org.bouncycastle.openpgp.PGPCompressedDataGenerator; -import org.bouncycastle.openpgp.PGPException; - import java.io.IOException; import java.io.OutputStream; - import javax.annotation.WillNotClose; +import org.bouncycastle.openpgp.PGPCompressedDataGenerator; +import org.bouncycastle.openpgp.PGPException; /** * OpenPGP compression service that wraps an {@link OutputStream}. diff --git a/java/google/registry/rde/RydePgpEncryptionOutputStream.java b/java/google/registry/rde/RydePgpEncryptionOutputStream.java index f2049aa2f..118048ee1 100644 --- a/java/google/registry/rde/RydePgpEncryptionOutputStream.java +++ b/java/google/registry/rde/RydePgpEncryptionOutputStream.java @@ -19,23 +19,19 @@ import static org.bouncycastle.jce.provider.BouncyCastleProvider.PROVIDER_NAME; import com.google.auto.factory.AutoFactory; import com.google.auto.factory.Provided; - import google.registry.config.ConfigModule.Config; import google.registry.util.ImprovedOutputStream; - -import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; -import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; - import java.io.IOException; import java.io.OutputStream; import java.security.NoSuchAlgorithmException; import java.security.ProviderException; import java.security.SecureRandom; - import javax.annotation.WillNotClose; +import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; +import org.bouncycastle.openpgp.PGPException; +import org.bouncycastle.openpgp.PGPPublicKey; +import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; +import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; /** * OpenPGP encryption service that wraps an {@link OutputStream}. diff --git a/java/google/registry/rde/RydePgpFileOutputStream.java b/java/google/registry/rde/RydePgpFileOutputStream.java index 5e302d763..c5d39d67b 100644 --- a/java/google/registry/rde/RydePgpFileOutputStream.java +++ b/java/google/registry/rde/RydePgpFileOutputStream.java @@ -19,17 +19,13 @@ import static org.bouncycastle.openpgp.PGPLiteralData.BINARY; import com.google.auto.factory.AutoFactory; import com.google.auto.factory.Provided; - import google.registry.config.ConfigModule.Config; import google.registry.util.ImprovedOutputStream; - -import org.bouncycastle.openpgp.PGPLiteralDataGenerator; -import org.joda.time.DateTime; - import java.io.IOException; import java.io.OutputStream; - import javax.annotation.WillNotClose; +import org.bouncycastle.openpgp.PGPLiteralDataGenerator; +import org.joda.time.DateTime; /** * OpenPGP literal data layer generator that wraps {@link OutputStream}. diff --git a/java/google/registry/rde/RydePgpSigningOutputStream.java b/java/google/registry/rde/RydePgpSigningOutputStream.java index e4709ef26..3d2c66bff 100644 --- a/java/google/registry/rde/RydePgpSigningOutputStream.java +++ b/java/google/registry/rde/RydePgpSigningOutputStream.java @@ -19,9 +19,11 @@ import static org.bouncycastle.bcpg.PublicKeyAlgorithmTags.RSA_GENERAL; import static org.bouncycastle.openpgp.PGPSignature.BINARY_DOCUMENT; import com.google.auto.factory.AutoFactory; - import google.registry.util.ImprovedOutputStream; - +import java.io.IOException; +import java.io.OutputStream; +import java.util.Iterator; +import javax.annotation.WillNotClose; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPublicKey; @@ -29,12 +31,6 @@ import org.bouncycastle.openpgp.PGPSignatureGenerator; import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator; import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Iterator; - -import javax.annotation.WillNotClose; - /** * OpenPGP detached signing service that wraps an {@link OutputStream}. * diff --git a/java/google/registry/rde/RydeTarOutputStream.java b/java/google/registry/rde/RydeTarOutputStream.java index 3428fc53c..7370b84ee 100644 --- a/java/google/registry/rde/RydeTarOutputStream.java +++ b/java/google/registry/rde/RydeTarOutputStream.java @@ -17,16 +17,12 @@ package google.registry.rde; import static com.google.common.base.Preconditions.checkArgument; import com.google.auto.factory.AutoFactory; - import google.registry.util.ImprovedOutputStream; import google.registry.util.PosixTarHeader; - -import org.joda.time.DateTime; - import java.io.IOException; import java.io.OutputStream; - import javax.annotation.WillNotClose; +import org.joda.time.DateTime; /** * Single-file POSIX tar archive creator that wraps an {@link OutputStream}. diff --git a/java/google/registry/rde/XjcToContactResourceConverter.java b/java/google/registry/rde/XjcToContactResourceConverter.java index 6fbf97cdf..15a81c15c 100644 --- a/java/google/registry/rde/XjcToContactResourceConverter.java +++ b/java/google/registry/rde/XjcToContactResourceConverter.java @@ -33,7 +33,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import google.registry.model.contact.ContactAddress; import google.registry.model.contact.ContactPhoneNumber; import google.registry.model.contact.ContactResource; @@ -53,7 +52,6 @@ import google.registry.xjc.contact.XjcContactPostalInfoType; import google.registry.xjc.contact.XjcContactStatusType; import google.registry.xjc.rdecontact.XjcRdeContact; import google.registry.xjc.rdecontact.XjcRdeContactTransferDataType; - import javax.annotation.Nullable; /** Utility class that converts an {@link XjcRdeContact} into a {@link ContactResource}. */ diff --git a/java/google/registry/request/DelegatedOAuthScopes.java b/java/google/registry/request/DelegatedOAuthScopes.java index 52616c955..2ac9cc319 100644 --- a/java/google/registry/request/DelegatedOAuthScopes.java +++ b/java/google/registry/request/DelegatedOAuthScopes.java @@ -16,7 +16,6 @@ package google.registry.request; import java.lang.annotation.Documented; import java.util.Set; - import javax.inject.Qualifier; /** diff --git a/java/google/registry/request/Header.java b/java/google/registry/request/Header.java index ea74bc440..693939789 100644 --- a/java/google/registry/request/Header.java +++ b/java/google/registry/request/Header.java @@ -15,7 +15,6 @@ package google.registry.request; import java.lang.annotation.Documented; - import javax.inject.Qualifier; /** Dagger qualifier for HTTP headers. */ diff --git a/java/google/registry/request/HttpException.java b/java/google/registry/request/HttpException.java index f5744413a..2ffff6867 100644 --- a/java/google/registry/request/HttpException.java +++ b/java/google/registry/request/HttpException.java @@ -17,9 +17,7 @@ package google.registry.request; import static com.google.common.html.HtmlEscapers.htmlEscaper; import google.registry.util.FormattingLogger; - import java.io.IOException; - import javax.servlet.http.HttpServletResponse; /** Base for exceptions that cause an HTTP error response. */ diff --git a/java/google/registry/request/JsonActionRunner.java b/java/google/registry/request/JsonActionRunner.java index 9685a02f3..0309f627c 100644 --- a/java/google/registry/request/JsonActionRunner.java +++ b/java/google/registry/request/JsonActionRunner.java @@ -17,7 +17,6 @@ package google.registry.request; import static com.google.common.base.Verify.verifyNotNull; import java.util.Map; - import javax.inject.Inject; /** Runner for actions that read and write JSON objects. */ diff --git a/java/google/registry/request/JsonPayload.java b/java/google/registry/request/JsonPayload.java index c1f61ccb1..b2921841c 100644 --- a/java/google/registry/request/JsonPayload.java +++ b/java/google/registry/request/JsonPayload.java @@ -15,7 +15,6 @@ package google.registry.request; import java.lang.annotation.Documented; - import javax.inject.Qualifier; /** diff --git a/java/google/registry/request/JsonResponse.java b/java/google/registry/request/JsonResponse.java index 9f45c3c5a..419d1434b 100644 --- a/java/google/registry/request/JsonResponse.java +++ b/java/google/registry/request/JsonResponse.java @@ -20,11 +20,9 @@ import static com.google.common.net.HttpHeaders.X_CONTENT_TYPE_OPTIONS; import static com.google.common.net.MediaType.JSON_UTF_8; import static org.json.simple.JSONValue.toJSONString; -import org.joda.time.DateTime; - import java.util.Map; - import javax.inject.Inject; +import org.joda.time.DateTime; /** JSON response object. */ public class JsonResponse { diff --git a/java/google/registry/request/Modules.java b/java/google/registry/request/Modules.java index 9151e8b83..939a2f04f 100644 --- a/java/google/registry/request/Modules.java +++ b/java/google/registry/request/Modules.java @@ -31,18 +31,14 @@ import com.google.appengine.api.urlfetch.URLFetchService; import com.google.appengine.api.urlfetch.URLFetchServiceFactory; import com.google.appengine.api.users.UserService; import com.google.appengine.api.users.UserServiceFactory; - import dagger.Binds; import dagger.Module; import dagger.Provides; - import google.registry.config.ConfigModule.Config; import google.registry.keyring.api.KeyModule.Key; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.Set; - import javax.inject.Named; import javax.inject.Singleton; diff --git a/java/google/registry/request/OAuthScopes.java b/java/google/registry/request/OAuthScopes.java index 7e6e82c2d..63af0206f 100644 --- a/java/google/registry/request/OAuthScopes.java +++ b/java/google/registry/request/OAuthScopes.java @@ -16,7 +16,6 @@ package google.registry.request; import java.lang.annotation.Documented; import java.util.Set; - import javax.inject.Qualifier; /** Dagger qualifier for the {@link Set} of OAuth2 scope strings, used for API authorization. */ diff --git a/java/google/registry/request/Parameter.java b/java/google/registry/request/Parameter.java index 4b170329f..921d2a0f9 100644 --- a/java/google/registry/request/Parameter.java +++ b/java/google/registry/request/Parameter.java @@ -15,7 +15,6 @@ package google.registry.request; import java.lang.annotation.Documented; - import javax.inject.Qualifier; /** Dagger qualifier for HTTP parameters. */ diff --git a/java/google/registry/request/ParameterMap.java b/java/google/registry/request/ParameterMap.java index 836b8c9fb..99564d125 100644 --- a/java/google/registry/request/ParameterMap.java +++ b/java/google/registry/request/ParameterMap.java @@ -15,7 +15,6 @@ package google.registry.request; import java.lang.annotation.Documented; - import javax.inject.Qualifier; /** Dagger qualifier for {@link com.google.common.collect.ImmutableListMultimap} of HTTP params. */ diff --git a/java/google/registry/request/Payload.java b/java/google/registry/request/Payload.java index 619b3d154..2314bad5f 100644 --- a/java/google/registry/request/Payload.java +++ b/java/google/registry/request/Payload.java @@ -15,7 +15,6 @@ package google.registry.request; import java.lang.annotation.Documented; - import javax.inject.Qualifier; /** diff --git a/java/google/registry/request/RequestHandler.java b/java/google/registry/request/RequestHandler.java index b89ed1c8c..d22fd856e 100644 --- a/java/google/registry/request/RequestHandler.java +++ b/java/google/registry/request/RequestHandler.java @@ -28,17 +28,13 @@ import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import com.google.appengine.api.users.UserService; import com.google.appengine.api.users.UserServiceFactory; import com.google.common.base.Optional; - import google.registry.util.FormattingLogger; import google.registry.util.NonFinalForTesting; - -import org.joda.time.Duration; - import java.io.IOException; import java.lang.reflect.Method; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.joda.time.Duration; /** * Dagger request processor for Domain Registry. diff --git a/java/google/registry/request/RequestMethod.java b/java/google/registry/request/RequestMethod.java index 4358e363c..1a713875a 100644 --- a/java/google/registry/request/RequestMethod.java +++ b/java/google/registry/request/RequestMethod.java @@ -15,7 +15,6 @@ package google.registry.request; import java.lang.annotation.Documented; - import javax.inject.Qualifier; /** diff --git a/java/google/registry/request/RequestModule.java b/java/google/registry/request/RequestModule.java index 40d75167b..950ead0fa 100644 --- a/java/google/registry/request/RequestModule.java +++ b/java/google/registry/request/RequestModule.java @@ -22,22 +22,17 @@ import com.google.common.collect.ImmutableListMultimap; import com.google.common.io.ByteStreams; import com.google.common.io.CharStreams; import com.google.common.net.MediaType; - import dagger.Module; import dagger.Provides; - import google.registry.request.HttpException.BadRequestException; import google.registry.request.HttpException.UnsupportedMediaTypeException; - -import org.json.simple.JSONValue; -import org.json.simple.parser.ParseException; - import java.io.IOException; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.json.simple.JSONValue; +import org.json.simple.parser.ParseException; /** Dagger module for servlets. */ @Module diff --git a/java/google/registry/request/RequestParameters.java b/java/google/registry/request/RequestParameters.java index 1402c9e56..e7cb7283b 100644 --- a/java/google/registry/request/RequestParameters.java +++ b/java/google/registry/request/RequestParameters.java @@ -22,15 +22,11 @@ import com.google.common.base.Ascii; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; - import google.registry.request.HttpException.BadRequestException; - -import org.joda.time.DateTime; - import java.net.InetAddress; - import javax.annotation.Nullable; import javax.servlet.http.HttpServletRequest; +import org.joda.time.DateTime; /** Utilities for extracting parameters from HTTP requests. */ public final class RequestParameters { diff --git a/java/google/registry/request/RequestPath.java b/java/google/registry/request/RequestPath.java index 9de31f0a7..7e899060d 100644 --- a/java/google/registry/request/RequestPath.java +++ b/java/google/registry/request/RequestPath.java @@ -15,7 +15,6 @@ package google.registry.request; import java.lang.annotation.Documented; - import javax.inject.Qualifier; /** diff --git a/java/google/registry/request/RequestScope.java b/java/google/registry/request/RequestScope.java index d29978bba..5a05d2ee7 100644 --- a/java/google/registry/request/RequestScope.java +++ b/java/google/registry/request/RequestScope.java @@ -19,7 +19,6 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; - import javax.inject.Scope; /** Dagger annotation for request-scoped components that depend on a global component. */ diff --git a/java/google/registry/request/Response.java b/java/google/registry/request/Response.java index 92778ed67..b86ad2d11 100644 --- a/java/google/registry/request/Response.java +++ b/java/google/registry/request/Response.java @@ -15,10 +15,8 @@ package google.registry.request; import com.google.common.net.MediaType; - -import org.joda.time.DateTime; - import javax.servlet.http.HttpServletResponse; +import org.joda.time.DateTime; /** * HTTP request response object. diff --git a/java/google/registry/request/ResponseImpl.java b/java/google/registry/request/ResponseImpl.java index 3382d1152..4354ad6ff 100644 --- a/java/google/registry/request/ResponseImpl.java +++ b/java/google/registry/request/ResponseImpl.java @@ -15,13 +15,10 @@ package google.registry.request; import com.google.common.net.MediaType; - -import org.joda.time.DateTime; - import java.io.IOException; - import javax.inject.Inject; import javax.servlet.http.HttpServletResponse; +import org.joda.time.DateTime; /** HTTP response object. */ public final class ResponseImpl implements Response { diff --git a/java/google/registry/request/Router.java b/java/google/registry/request/Router.java index 106db4b4a..884907d75 100644 --- a/java/google/registry/request/Router.java +++ b/java/google/registry/request/Router.java @@ -19,7 +19,6 @@ import com.google.common.base.Optional; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Ordering; - import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Map; diff --git a/java/google/registry/security/JsonHttp.java b/java/google/registry/security/JsonHttp.java index 9990c3dfe..1c667c71b 100644 --- a/java/google/registry/security/JsonHttp.java +++ b/java/google/registry/security/JsonHttp.java @@ -21,20 +21,16 @@ import static com.google.common.net.MediaType.JSON_UTF_8; import static org.json.simple.JSONValue.writeJSONString; import com.google.common.net.MediaType; - import google.registry.util.FormattingLogger; - -import org.json.simple.JSONValue; -import org.json.simple.parser.ParseException; - import java.io.IOException; import java.io.Reader; import java.io.Writer; import java.util.Map; - import javax.annotation.Nullable; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.json.simple.JSONValue; +import org.json.simple.parser.ParseException; /** * Helper class for servlets that read or write JSON. diff --git a/java/google/registry/security/JsonResponseHelper.java b/java/google/registry/security/JsonResponseHelper.java index 78444fe3d..4dcc15d94 100644 --- a/java/google/registry/security/JsonResponseHelper.java +++ b/java/google/registry/security/JsonResponseHelper.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import java.util.Map; /** diff --git a/java/google/registry/security/JsonTransportServlet.java b/java/google/registry/security/JsonTransportServlet.java index af0fd6b2a..044bd31d2 100644 --- a/java/google/registry/security/JsonTransportServlet.java +++ b/java/google/registry/security/JsonTransportServlet.java @@ -19,10 +19,8 @@ import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static javax.servlet.http.HttpServletResponse.SC_OK; import google.registry.request.HttpException; - import java.io.IOException; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/java/google/registry/security/XsrfProtectedServlet.java b/java/google/registry/security/XsrfProtectedServlet.java index 6cf45deed..05e17d019 100644 --- a/java/google/registry/security/XsrfProtectedServlet.java +++ b/java/google/registry/security/XsrfProtectedServlet.java @@ -22,15 +22,12 @@ import static google.registry.security.XsrfTokenManager.validateToken; import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; import com.google.appengine.api.users.UserService; - -import org.joda.time.Duration; - import java.io.IOException; - import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.joda.time.Duration; /** * Servlet with Cross-Site Request Forgery (XSRF) protection. diff --git a/java/google/registry/security/XsrfTokenManager.java b/java/google/registry/security/XsrfTokenManager.java index 776de9f81..a1b326e39 100644 --- a/java/google/registry/security/XsrfTokenManager.java +++ b/java/google/registry/security/XsrfTokenManager.java @@ -23,17 +23,14 @@ import com.google.appengine.api.users.UserService; import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.hash.Hashing; - import google.registry.util.Clock; import google.registry.util.FormattingLogger; import google.registry.util.NonFinalForTesting; import google.registry.util.SystemClock; - +import java.util.List; import org.joda.time.DateTime; import org.joda.time.Duration; -import java.util.List; - /** Helper class for generating and validate XSRF tokens. */ public final class XsrfTokenManager { diff --git a/java/google/registry/storage/drive/DriveConnection.java b/java/google/registry/storage/drive/DriveConnection.java index 165acb5a5..a112e65b1 100644 --- a/java/google/registry/storage/drive/DriveConnection.java +++ b/java/google/registry/storage/drive/DriveConnection.java @@ -24,10 +24,8 @@ import com.google.api.services.drive.model.ParentReference; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.net.MediaType; - import java.io.IOException; import java.util.List; - import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/java/google/registry/tldconfig/idn/IdnLabelValidator.java b/java/google/registry/tldconfig/idn/IdnLabelValidator.java index d85defd97..bb8a71f05 100644 --- a/java/google/registry/tldconfig/idn/IdnLabelValidator.java +++ b/java/google/registry/tldconfig/idn/IdnLabelValidator.java @@ -20,7 +20,6 @@ import static google.registry.tldconfig.idn.IdnTableEnum.JA; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import google.registry.util.Idn; import google.registry.util.NonFinalForTesting; diff --git a/java/google/registry/tldconfig/idn/IdnTable.java b/java/google/registry/tldconfig/idn/IdnTable.java index 14e24b43c..fb7cb060f 100644 --- a/java/google/registry/tldconfig/idn/IdnTable.java +++ b/java/google/registry/tldconfig/idn/IdnTable.java @@ -23,7 +23,6 @@ import com.google.common.collect.Range; import com.google.common.collect.RangeSet; import com.google.re2j.Matcher; import com.google.re2j.Pattern; - import java.net.URI; /** An IDN table for a particular TLD. */ diff --git a/java/google/registry/tldconfig/idn/IdnTableEnum.java b/java/google/registry/tldconfig/idn/IdnTableEnum.java index 4af507291..71e2eb0fe 100644 --- a/java/google/registry/tldconfig/idn/IdnTableEnum.java +++ b/java/google/registry/tldconfig/idn/IdnTableEnum.java @@ -19,7 +19,6 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.Ascii; import com.google.common.io.Resources; - import java.io.IOException; import java.net.URL; diff --git a/java/google/registry/tldconfig/idn/JapaneseLanguageValidator.java b/java/google/registry/tldconfig/idn/JapaneseLanguageValidator.java index cf3113ccb..91bceccb3 100644 --- a/java/google/registry/tldconfig/idn/JapaneseLanguageValidator.java +++ b/java/google/registry/tldconfig/idn/JapaneseLanguageValidator.java @@ -22,7 +22,6 @@ import static java.lang.Character.UnicodeBlock.KATAKANA; import com.google.common.collect.ImmutableRangeSet; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Range; - import java.lang.Character.UnicodeBlock; /** diff --git a/java/google/registry/tmch/ClaimsListParser.java b/java/google/registry/tmch/ClaimsListParser.java index a520f1873..178f06274 100644 --- a/java/google/registry/tmch/ClaimsListParser.java +++ b/java/google/registry/tmch/ClaimsListParser.java @@ -18,12 +18,9 @@ import static com.google.common.base.Preconditions.checkArgument; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; - import google.registry.model.tmch.ClaimsListShard; - -import org.joda.time.DateTime; - import java.util.List; +import org.joda.time.DateTime; /** * Claims List (MarksDB DNL CSV) Parser. diff --git a/java/google/registry/tmch/LordnLog.java b/java/google/registry/tmch/LordnLog.java index fb1bd4a9d..ca8f1c82a 100644 --- a/java/google/registry/tmch/LordnLog.java +++ b/java/google/registry/tmch/LordnLog.java @@ -21,16 +21,13 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; import com.google.re2j.Pattern; - -import org.joda.time.DateTime; - import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; - import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; +import org.joda.time.DateTime; /** * Parser of LORDN log responses from the MarksDB server during the NORDN process. diff --git a/java/google/registry/tmch/LordnRequestInitializer.java b/java/google/registry/tmch/LordnRequestInitializer.java index 55d154de7..619314701 100644 --- a/java/google/registry/tmch/LordnRequestInitializer.java +++ b/java/google/registry/tmch/LordnRequestInitializer.java @@ -19,10 +19,8 @@ import static google.registry.util.UrlFetchUtils.setAuthorizationHeader; import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.common.base.Optional; - import google.registry.keyring.api.KeyModule.Key; import google.registry.model.registry.Registry; - import javax.inject.Inject; /** Helper class for setting the authorization header on a MarksDB LORDN request. */ diff --git a/java/google/registry/tmch/LordnTask.java b/java/google/registry/tmch/LordnTask.java index 10adbb05f..f9536863f 100644 --- a/java/google/registry/tmch/LordnTask.java +++ b/java/google/registry/tmch/LordnTask.java @@ -29,16 +29,13 @@ import com.google.common.base.Joiner; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.Uninterruptibles; - import google.registry.model.domain.DomainResource; import google.registry.model.registrar.Registrar; import google.registry.util.NonFinalForTesting; - -import org.joda.time.DateTime; -import org.joda.time.Duration; - import java.util.List; import java.util.concurrent.TimeUnit; +import org.joda.time.DateTime; +import org.joda.time.Duration; /** * Helper methods for creating tasks containing CSV line data in the lordn-sunrise and lordn-claims diff --git a/java/google/registry/tmch/Marksdb.java b/java/google/registry/tmch/Marksdb.java index 87f5a907c..a8d6e0937 100644 --- a/java/google/registry/tmch/Marksdb.java +++ b/java/google/registry/tmch/Marksdb.java @@ -26,11 +26,17 @@ import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.appengine.api.urlfetch.URLFetchService; import com.google.common.base.Optional; import com.google.common.io.ByteSource; - import google.registry.config.ConfigModule.Config; import google.registry.keyring.api.KeyModule.Key; import google.registry.util.UrlFetchException; - +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.net.URL; +import java.security.Security; +import java.security.SignatureException; +import java.util.List; +import javax.annotation.Tainted; +import javax.inject.Inject; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPObjectFactory; @@ -41,16 +47,6 @@ import org.bouncycastle.openpgp.PGPUtil; import org.bouncycastle.openpgp.bc.BcPGPObjectFactory; import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.net.URL; -import java.security.Security; -import java.security.SignatureException; -import java.util.List; - -import javax.annotation.Tainted; -import javax.inject.Inject; - /** Shared code for tasks that download stuff from MarksDB. */ public final class Marksdb { diff --git a/java/google/registry/tmch/NordnUploadAction.java b/java/google/registry/tmch/NordnUploadAction.java index a58311374..1af316e8d 100644 --- a/java/google/registry/tmch/NordnUploadAction.java +++ b/java/google/registry/tmch/NordnUploadAction.java @@ -35,7 +35,6 @@ import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.appengine.api.urlfetch.URLFetchService; import com.google.common.base.Optional; - import google.registry.config.ConfigModule.Config; import google.registry.request.Action; import google.registry.request.Parameter; @@ -43,16 +42,13 @@ import google.registry.request.RequestParameters; import google.registry.util.Clock; import google.registry.util.FormattingLogger; import google.registry.util.UrlFetchException; - -import org.joda.time.DateTime; -import org.joda.time.Duration; - import java.io.IOException; import java.net.URL; import java.util.List; import java.util.Random; - import javax.inject.Inject; +import org.joda.time.DateTime; +import org.joda.time.Duration; /** * Action that reads the NORDN pull queues, uploads claims and sunrise marks data to TMCH, and diff --git a/java/google/registry/tmch/NordnVerifyAction.java b/java/google/registry/tmch/NordnVerifyAction.java index 9c71f631b..9a21926d6 100644 --- a/java/google/registry/tmch/NordnVerifyAction.java +++ b/java/google/registry/tmch/NordnVerifyAction.java @@ -25,7 +25,6 @@ import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.appengine.api.urlfetch.URLFetchService; import com.google.common.annotations.VisibleForTesting; import com.google.common.io.ByteSource; - import google.registry.request.Action; import google.registry.request.Header; import google.registry.request.HttpException.BadRequestException; @@ -35,11 +34,9 @@ import google.registry.request.RequestParameters; import google.registry.request.Response; import google.registry.util.FormattingLogger; import google.registry.util.UrlFetchException; - import java.io.IOException; import java.net.URL; import java.util.Map.Entry; - import javax.inject.Inject; /** diff --git a/java/google/registry/tmch/SmdrlCsvParser.java b/java/google/registry/tmch/SmdrlCsvParser.java index 930068657..af4cc9568 100644 --- a/java/google/registry/tmch/SmdrlCsvParser.java +++ b/java/google/registry/tmch/SmdrlCsvParser.java @@ -19,12 +19,9 @@ import static org.joda.time.DateTimeZone.UTC; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; - import google.registry.model.smd.SignedMarkRevocationList; - -import org.joda.time.DateTime; - import java.util.List; +import org.joda.time.DateTime; /** * Signed Mark Data Revocation List (SMDRL) CSV Parser diff --git a/java/google/registry/tmch/TmchCertificateAuthority.java b/java/google/registry/tmch/TmchCertificateAuthority.java index 0db1cc49a..55b891285 100644 --- a/java/google/registry/tmch/TmchCertificateAuthority.java +++ b/java/google/registry/tmch/TmchCertificateAuthority.java @@ -21,18 +21,15 @@ import static google.registry.util.ResourceUtils.readResourceUtf8; import static google.registry.util.X509Utils.loadCrl; import com.google.common.base.Supplier; - import google.registry.config.RegistryEnvironment; import google.registry.model.tmch.TmchCrl; import google.registry.util.Clock; import google.registry.util.NonFinalForTesting; import google.registry.util.SystemClock; import google.registry.util.X509Utils; - import java.security.GeneralSecurityException; import java.security.cert.X509CRL; import java.security.cert.X509Certificate; - import javax.annotation.concurrent.Immutable; import javax.annotation.concurrent.ThreadSafe; diff --git a/java/google/registry/tmch/TmchCrlAction.java b/java/google/registry/tmch/TmchCrlAction.java index 3548ae2c1..cef4d63da 100644 --- a/java/google/registry/tmch/TmchCrlAction.java +++ b/java/google/registry/tmch/TmchCrlAction.java @@ -18,14 +18,11 @@ import static google.registry.request.Action.Method.POST; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.Optional; - import google.registry.config.ConfigModule.Config; import google.registry.request.Action; - import java.io.IOException; import java.net.URL; import java.security.GeneralSecurityException; - import javax.inject.Inject; /** Action to download the latest ICANN TMCH CRL from MarksDB. */ diff --git a/java/google/registry/tmch/TmchData.java b/java/google/registry/tmch/TmchData.java index d0e3bb99d..78dcdea54 100644 --- a/java/google/registry/tmch/TmchData.java +++ b/java/google/registry/tmch/TmchData.java @@ -17,16 +17,13 @@ package google.registry.tmch; import static com.google.common.base.CharMatcher.whitespace; import com.google.common.io.ByteSource; - import google.registry.model.smd.EncodedSignedMark; - +import java.io.IOException; +import java.io.InputStream; import org.bouncycastle.openpgp.PGPPublicKey; import org.bouncycastle.openpgp.PGPUtil; import org.bouncycastle.openpgp.bc.BcPGPPublicKeyRing; -import java.io.IOException; -import java.io.InputStream; - /** Helper class for common data loaded from the jar and datastore at runtime. */ public final class TmchData { diff --git a/java/google/registry/tmch/TmchDnlAction.java b/java/google/registry/tmch/TmchDnlAction.java index 1429d567a..8c39b71c6 100644 --- a/java/google/registry/tmch/TmchDnlAction.java +++ b/java/google/registry/tmch/TmchDnlAction.java @@ -17,19 +17,15 @@ package google.registry.tmch; import static google.registry.request.Action.Method.POST; import com.google.common.base.Optional; - import google.registry.keyring.api.KeyModule.Key; import google.registry.model.tmch.ClaimsListShard; import google.registry.request.Action; import google.registry.util.FormattingLogger; - -import org.bouncycastle.openpgp.PGPException; - import java.io.IOException; import java.security.SignatureException; import java.util.List; - import javax.inject.Inject; +import org.bouncycastle.openpgp.PGPException; /** Action to download the latest domain name list (aka claims list) from MarksDB. */ @Action(path = "/_dr/task/tmchDnl", method = POST, automaticallyPrintOk = true) diff --git a/java/google/registry/tmch/TmchModule.java b/java/google/registry/tmch/TmchModule.java index 29e5c9575..d46df8f3f 100644 --- a/java/google/registry/tmch/TmchModule.java +++ b/java/google/registry/tmch/TmchModule.java @@ -21,18 +21,14 @@ import static google.registry.request.RequestParameters.extractRequiredParameter import dagger.Module; import dagger.Provides; - import google.registry.keyring.api.KeyModule.Key; import google.registry.request.Header; import google.registry.request.HttpException.BadRequestException; import google.registry.request.Parameter; - -import org.bouncycastle.openpgp.PGPPublicKey; - import java.net.MalformedURLException; import java.net.URL; - import javax.servlet.http.HttpServletRequest; +import org.bouncycastle.openpgp.PGPPublicKey; /** Dagger module for TMCH package. */ @Module diff --git a/java/google/registry/tmch/TmchSmdrlAction.java b/java/google/registry/tmch/TmchSmdrlAction.java index df40c8352..48308a033 100644 --- a/java/google/registry/tmch/TmchSmdrlAction.java +++ b/java/google/registry/tmch/TmchSmdrlAction.java @@ -17,19 +17,15 @@ package google.registry.tmch; import static google.registry.request.Action.Method.POST; import com.google.common.base.Optional; - import google.registry.keyring.api.KeyModule.Key; import google.registry.model.smd.SignedMarkRevocationList; import google.registry.request.Action; import google.registry.util.FormattingLogger; - -import org.bouncycastle.openpgp.PGPException; - import java.io.IOException; import java.security.SignatureException; import java.util.List; - import javax.inject.Inject; +import org.bouncycastle.openpgp.PGPException; /** Action to download the latest signed mark revocation list from MarksDB. */ @Action(path = "/_dr/task/tmchSmdrl", method = POST, automaticallyPrintOk = true) diff --git a/java/google/registry/tmch/TmchXmlSignature.java b/java/google/registry/tmch/TmchXmlSignature.java index 2a6df751d..9b5b0597e 100644 --- a/java/google/registry/tmch/TmchXmlSignature.java +++ b/java/google/registry/tmch/TmchXmlSignature.java @@ -21,11 +21,6 @@ import static com.google.common.base.Throwables.propagateIfInstanceOf; import static google.registry.xml.XmlTransformer.loadXmlSchemas; import com.google.common.collect.ImmutableList; - -import org.w3c.dom.Document; -import org.w3c.dom.NodeList; -import org.xml.sax.SAXException; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -35,7 +30,6 @@ import java.security.SignatureException; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; import java.util.List; - import javax.annotation.Nullable; import javax.annotation.concurrent.ThreadSafe; import javax.xml.crypto.AlgorithmMethod; @@ -54,6 +48,9 @@ import javax.xml.crypto.dsig.keyinfo.X509Data; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import javax.xml.validation.Schema; +import org.w3c.dom.Document; +import org.w3c.dom.NodeList; +import org.xml.sax.SAXException; /** Helper class for verifying TMCH certificates and XML signatures. */ @ThreadSafe diff --git a/java/google/registry/tools/AllocateDomainCommand.java b/java/google/registry/tools/AllocateDomainCommand.java index db9913885..64ff8ea78 100644 --- a/java/google/registry/tools/AllocateDomainCommand.java +++ b/java/google/registry/tools/AllocateDomainCommand.java @@ -24,19 +24,17 @@ import static google.registry.flows.EppXmlTransformer.unmarshal; import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.tools.CommandUtilities.addHeader; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMap; import com.google.template.soy.data.SoyMapData; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.Work; - import google.registry.flows.EppException; import google.registry.model.domain.DesignatedContact; import google.registry.model.domain.DomainApplication; @@ -50,7 +48,6 @@ import google.registry.model.eppinput.EppInput.ResourceCommandWrapper; import google.registry.model.reporting.HistoryEntry; import google.registry.model.smd.SignedMark; import google.registry.tools.soy.DomainAllocateSoyInfo; - import java.util.ArrayList; import java.util.List; diff --git a/java/google/registry/tools/AppEngineConnection.java b/java/google/registry/tools/AppEngineConnection.java index 55f6bc7d2..6698d4c88 100644 --- a/java/google/registry/tools/AppEngineConnection.java +++ b/java/google/registry/tools/AppEngineConnection.java @@ -22,6 +22,8 @@ import static google.registry.security.JsonHttp.JSON_SAFETY_PREFIX; import static google.registry.security.XsrfTokenManager.X_CSRF_TOKEN; import static java.nio.charset.StandardCharsets.UTF_8; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Supplier; @@ -32,17 +34,9 @@ import com.google.common.net.HostAndPort; import com.google.common.net.MediaType; import com.google.re2j.Matcher; import com.google.re2j.Pattern; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; - import google.registry.config.RegistryEnvironment; import google.registry.security.XsrfTokenManager; import google.registry.tools.ServerSideCommand.Connection; - -import org.joda.time.Duration; -import org.json.simple.JSONValue; - import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStream; @@ -51,6 +45,8 @@ import java.net.URL; import java.net.URLEncoder; import java.util.Map; import java.util.Map.Entry; +import org.joda.time.Duration; +import org.json.simple.JSONValue; /** An http connection to the appengine server. */ @Parameters(separators = " =") diff --git a/java/google/registry/tools/AuctionStatusCommand.java b/java/google/registry/tools/AuctionStatusCommand.java index b69c4f3bf..566e01384 100644 --- a/java/google/registry/tools/AuctionStatusCommand.java +++ b/java/google/registry/tools/AuctionStatusCommand.java @@ -21,6 +21,8 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.model.registry.Registries.findTldForName; import static java.nio.charset.StandardCharsets.UTF_8; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.base.Function; import com.google.common.base.Strings; import com.google.common.collect.ComparisonChain; @@ -30,17 +32,12 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import com.google.common.net.InternetDomainName; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; import com.googlecode.objectify.Work; - import google.registry.model.contact.ContactResource; import google.registry.model.domain.DomainApplication; import google.registry.tools.Command.GtechCommand; import google.registry.tools.Command.RemoteApiCommand; import google.registry.tools.params.PathParameter; - import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/java/google/registry/tools/BigqueryCommand.java b/java/google/registry/tools/BigqueryCommand.java index cff1be3f9..d23a1f1a2 100644 --- a/java/google/registry/tools/BigqueryCommand.java +++ b/java/google/registry/tools/BigqueryCommand.java @@ -15,7 +15,6 @@ package google.registry.tools; import com.beust.jcommander.ParametersDelegate; - import google.registry.bigquery.BigqueryConnection; /** A {@link Command} that uses the bigquery client API. */ diff --git a/java/google/registry/tools/BigqueryCommandUtilities.java b/java/google/registry/tools/BigqueryCommandUtilities.java index 71e70ea74..f440de564 100644 --- a/java/google/registry/tools/BigqueryCommandUtilities.java +++ b/java/google/registry/tools/BigqueryCommandUtilities.java @@ -15,9 +15,7 @@ package google.registry.tools; import com.google.common.util.concurrent.ListenableFuture; - import google.registry.bigquery.BigqueryConnection.DestinationTable; - import java.util.concurrent.ExecutionException; /** Container class for static utility methods for Bigquery commands. */ diff --git a/java/google/registry/tools/BigqueryParameters.java b/java/google/registry/tools/BigqueryParameters.java index 8b5faf948..dde1c5d6f 100644 --- a/java/google/registry/tools/BigqueryParameters.java +++ b/java/google/registry/tools/BigqueryParameters.java @@ -14,24 +14,20 @@ package google.registry.tools; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; import com.google.api.client.http.HttpTransport; import com.google.api.client.http.javanet.NetHttpTransport; import com.google.api.client.json.JsonFactory; import com.google.api.client.json.jackson2.JacksonFactory; import com.google.api.services.bigquery.BigqueryScopes; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; - import google.registry.bigquery.BigqueryConnection; import google.registry.tools.params.PathParameter; - -import org.joda.time.Duration; - import java.nio.file.Path; import java.nio.file.Paths; import java.util.concurrent.Executors; +import org.joda.time.Duration; /** Parameter delegate class to handle flag settings for a command's BigqueryConnection object. */ @Parameters(separators = " =") diff --git a/java/google/registry/tools/CanonicalizeLabelsCommand.java b/java/google/registry/tools/CanonicalizeLabelsCommand.java index 9dff75cb9..583b81878 100644 --- a/java/google/registry/tools/CanonicalizeLabelsCommand.java +++ b/java/google/registry/tools/CanonicalizeLabelsCommand.java @@ -17,18 +17,15 @@ package google.registry.tools; import static google.registry.util.DomainNameUtils.canonicalizeDomainName; import static java.nio.charset.StandardCharsets.UTF_8; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.base.Joiner; import com.google.common.io.CharStreams; import com.google.common.io.Files; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; - import google.registry.tools.Command.GtechCommand; import google.registry.util.DomainNameUtils; import google.registry.util.Idn; import google.registry.util.NonFinalForTesting; - import java.io.File; import java.io.IOException; import java.io.InputStream; diff --git a/java/google/registry/tools/CheckSnapshotCommand.java b/java/google/registry/tools/CheckSnapshotCommand.java index ae023caac..a8e9e5e3b 100644 --- a/java/google/registry/tools/CheckSnapshotCommand.java +++ b/java/google/registry/tools/CheckSnapshotCommand.java @@ -14,11 +14,9 @@ package google.registry.tools; -import com.google.common.collect.Iterables; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.collect.Iterables; import google.registry.export.DatastoreBackupInfo; import google.registry.export.DatastoreBackupService; import google.registry.tools.Command.RemoteApiCommand; diff --git a/java/google/registry/tools/ConfirmingCommand.java b/java/google/registry/tools/ConfirmingCommand.java index 29431fd4a..3ed0f70bb 100644 --- a/java/google/registry/tools/ConfirmingCommand.java +++ b/java/google/registry/tools/ConfirmingCommand.java @@ -16,9 +16,8 @@ package google.registry.tools; import static google.registry.tools.CommandUtilities.promptForYes; -import com.google.common.base.Strings; - import com.beust.jcommander.Parameter; +import com.google.common.base.Strings; /** A {@link Command} that implements a confirmation step before executing. */ public abstract class ConfirmingCommand implements Command { diff --git a/java/google/registry/tools/ConvertIdnCommand.java b/java/google/registry/tools/ConvertIdnCommand.java index c10ee5ffb..10a45b910 100644 --- a/java/google/registry/tools/ConvertIdnCommand.java +++ b/java/google/registry/tools/ConvertIdnCommand.java @@ -19,10 +19,8 @@ import static google.registry.util.DomainNameUtils.canonicalizeDomainName; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - import google.registry.tools.Command.GtechCommand; import google.registry.util.Idn; - import java.io.IOException; import java.util.List; diff --git a/java/google/registry/tools/CreateAnchorTenantCommand.java b/java/google/registry/tools/CreateAnchorTenantCommand.java index dba63ca9b..bef344ead 100644 --- a/java/google/registry/tools/CreateAnchorTenantCommand.java +++ b/java/google/registry/tools/CreateAnchorTenantCommand.java @@ -20,20 +20,16 @@ import static google.registry.model.registry.Registries.findTldForNameOrThrow; import static google.registry.pricing.PricingEngineProxy.getDomainCreateCost; import static org.joda.time.DateTimeZone.UTC; -import com.google.common.net.InternetDomainName; -import com.google.template.soy.data.SoyMapData; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.net.InternetDomainName; +import com.google.template.soy.data.SoyMapData; import google.registry.tools.Command.GtechCommand; import google.registry.tools.soy.CreateAnchorTenantSoyInfo; - +import javax.inject.Inject; import org.joda.money.Money; import org.joda.time.DateTime; -import javax.inject.Inject; - /** A command to create a new anchor tenant domain. */ @Parameters(separators = " =", commandDescription = "Provision a domain for an anchor tenant.") final class CreateAnchorTenantCommand extends MutatingEppToolCommand implements GtechCommand { diff --git a/java/google/registry/tools/CreateAuctionCreditsCommand.java b/java/google/registry/tools/CreateAuctionCreditsCommand.java index 1bb0b26d9..4baf76dcf 100644 --- a/java/google/registry/tools/CreateAuctionCreditsCommand.java +++ b/java/google/registry/tools/CreateAuctionCreditsCommand.java @@ -22,6 +22,8 @@ import static google.registry.model.registry.Registries.assertTldExists; import static java.util.Arrays.asList; import static org.joda.time.DateTimeZone.UTC; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.base.Function; import com.google.common.base.Splitter; import com.google.common.collect.FluentIterable; @@ -29,21 +31,11 @@ import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Iterables; import com.google.re2j.Matcher; import com.google.re2j.Pattern; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; - import google.registry.model.billing.RegistrarCredit; import google.registry.model.billing.RegistrarCredit.CreditType; import google.registry.model.billing.RegistrarCreditBalance; import google.registry.model.registrar.Registrar; import google.registry.model.registry.Registry; - -import org.joda.money.BigMoney; -import org.joda.money.CurrencyUnit; -import org.joda.money.Money; -import org.joda.time.DateTime; - import java.io.IOException; import java.math.BigDecimal; import java.math.RoundingMode; @@ -51,6 +43,10 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.util.List; +import org.joda.money.BigMoney; +import org.joda.money.CurrencyUnit; +import org.joda.money.Money; +import org.joda.time.DateTime; /** * Command for creating new auction credits based on a CSV file from Pool. diff --git a/java/google/registry/tools/CreateContactCommand.java b/java/google/registry/tools/CreateContactCommand.java index 308583c0e..96fc55920 100644 --- a/java/google/registry/tools/CreateContactCommand.java +++ b/java/google/registry/tools/CreateContactCommand.java @@ -17,17 +17,13 @@ package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Strings.isNullOrEmpty; -import com.google.template.soy.data.SoyMapData; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.template.soy.data.SoyMapData; import google.registry.tools.Command.GtechCommand; import google.registry.tools.params.PhoneNumberParameter; import google.registry.tools.soy.CreateContactSoyInfo; - import java.util.List; - import javax.inject.Inject; /** A command to create a new contact via EPP. */ diff --git a/java/google/registry/tools/CreateCreditBalanceCommand.java b/java/google/registry/tools/CreateCreditBalanceCommand.java index 0e4434ce5..bd0646cd0 100644 --- a/java/google/registry/tools/CreateCreditBalanceCommand.java +++ b/java/google/registry/tools/CreateCreditBalanceCommand.java @@ -19,13 +19,11 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - import google.registry.model.billing.RegistrarCredit; import google.registry.model.billing.RegistrarCreditBalance; import google.registry.model.registrar.Registrar; import google.registry.tools.Command.GtechCommand; import google.registry.util.SystemClock; - import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/java/google/registry/tools/CreateCreditCommand.java b/java/google/registry/tools/CreateCreditCommand.java index 3366a5bb5..20320ef7e 100644 --- a/java/google/registry/tools/CreateCreditCommand.java +++ b/java/google/registry/tools/CreateCreditCommand.java @@ -19,18 +19,15 @@ import static org.joda.time.DateTimeZone.UTC; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - import google.registry.model.billing.RegistrarCredit; import google.registry.model.billing.RegistrarCredit.CreditType; import google.registry.model.billing.RegistrarCreditBalance; import google.registry.model.registrar.Registrar; import google.registry.tools.Command.GtechCommand; - +import javax.annotation.Nullable; import org.joda.money.Money; import org.joda.time.DateTime; -import javax.annotation.Nullable; - /** Command for creating a registrar credit object with an initial balance. */ @Parameters(separators = " =", commandDescription = "Create a new registrar credit") final class CreateCreditCommand extends MutatingCommand implements GtechCommand { diff --git a/java/google/registry/tools/CreateOrUpdatePremiumListCommand.java b/java/google/registry/tools/CreateOrUpdatePremiumListCommand.java index ef9ff9bcc..206b196c7 100644 --- a/java/google/registry/tools/CreateOrUpdatePremiumListCommand.java +++ b/java/google/registry/tools/CreateOrUpdatePremiumListCommand.java @@ -21,25 +21,20 @@ import static google.registry.tools.server.CreateOrUpdatePremiumListAction.NAME_ import static google.registry.util.ListNamingUtils.convertFilePathToName; import static java.nio.charset.StandardCharsets.UTF_8; +import com.beust.jcommander.Parameter; import com.google.common.base.Joiner; import com.google.common.base.Verify; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; - -import com.beust.jcommander.Parameter; - import google.registry.model.registry.label.PremiumList; import google.registry.tools.params.PathParameter; - -import org.json.simple.JSONValue; - import java.net.URLEncoder; import java.nio.file.Files; import java.nio.file.Path; import java.util.List; import java.util.Map; - import javax.annotation.Nullable; +import org.json.simple.JSONValue; /** * Base class for specification of command line parameters common to creating and updating premium diff --git a/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java b/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java index 066cd08c8..f9317889c 100644 --- a/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java +++ b/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java @@ -23,13 +23,11 @@ import static google.registry.util.RegistrarUtils.normalizeRegistrarName; import static java.nio.charset.StandardCharsets.US_ASCII; import static org.joda.time.DateTimeZone.UTC; +import com.beust.jcommander.Parameter; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; - -import com.beust.jcommander.Parameter; - import google.registry.model.billing.RegistrarBillingUtils; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.Registrar.BillingMethod; @@ -39,19 +37,16 @@ import google.registry.tools.params.OptionalPhoneNumberParameter; import google.registry.tools.params.OptionalStringParameter; import google.registry.tools.params.PathParameter; import google.registry.util.CidrAddressBlock; - -import org.joda.money.CurrencyUnit; -import org.joda.money.Money; -import org.joda.time.DateTime; - import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; - import javax.annotation.Nullable; +import org.joda.money.CurrencyUnit; +import org.joda.money.Money; +import org.joda.time.DateTime; /** Shared base class for commands to create or update a {@link Registrar}. */ abstract class CreateOrUpdateRegistrarCommand extends MutatingCommand { diff --git a/java/google/registry/tools/CreateOrUpdateReservedListCommand.java b/java/google/registry/tools/CreateOrUpdateReservedListCommand.java index 1bcf3ae3a..b468ab654 100644 --- a/java/google/registry/tools/CreateOrUpdateReservedListCommand.java +++ b/java/google/registry/tools/CreateOrUpdateReservedListCommand.java @@ -15,11 +15,8 @@ package google.registry.tools; import com.beust.jcommander.Parameter; - import google.registry.tools.params.PathParameter; - import java.nio.file.Path; - import javax.annotation.Nullable; /** diff --git a/java/google/registry/tools/CreateOrUpdateTldCommand.java b/java/google/registry/tools/CreateOrUpdateTldCommand.java index aa7484d85..f14d25f02 100644 --- a/java/google/registry/tools/CreateOrUpdateTldCommand.java +++ b/java/google/registry/tools/CreateOrUpdateTldCommand.java @@ -19,15 +19,13 @@ import static google.registry.model.RoidSuffixes.isRoidSuffixUsed; import static google.registry.util.CollectionUtils.findDuplicates; import static google.registry.util.DomainNameUtils.canonicalizeDomainName; +import com.beust.jcommander.Parameter; import com.google.common.base.CharMatcher; import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; - -import com.beust.jcommander.Parameter; - import google.registry.model.pricing.StaticPremiumListPricingEngine; import google.registry.model.registry.Registries; import google.registry.model.registry.Registry; @@ -37,16 +35,13 @@ import google.registry.model.registry.label.PremiumList; import google.registry.tools.params.OptionalStringParameter; import google.registry.tools.params.TransitionListParameter.BillingCostTransitions; import google.registry.tools.params.TransitionListParameter.TldStateTransitions; - +import java.util.List; +import java.util.Set; +import javax.annotation.Nullable; import org.joda.money.Money; import org.joda.time.DateTime; import org.joda.time.Duration; -import java.util.List; -import java.util.Set; - -import javax.annotation.Nullable; - /** Shared base class for commands to create or update a TLD. */ abstract class CreateOrUpdateTldCommand extends MutatingCommand { diff --git a/java/google/registry/tools/CreatePremiumListCommand.java b/java/google/registry/tools/CreatePremiumListCommand.java index fbbdecd92..7a2db17d6 100644 --- a/java/google/registry/tools/CreatePremiumListCommand.java +++ b/java/google/registry/tools/CreatePremiumListCommand.java @@ -14,11 +14,9 @@ package google.registry.tools; -import com.google.common.collect.ImmutableMap; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.collect.ImmutableMap; import google.registry.model.registry.label.PremiumList; import google.registry.tools.server.CreatePremiumListAction; diff --git a/java/google/registry/tools/CreateRegistrarCommand.java b/java/google/registry/tools/CreateRegistrarCommand.java index 045cadd9c..3d0b5d9b8 100644 --- a/java/google/registry/tools/CreateRegistrarCommand.java +++ b/java/google/registry/tools/CreateRegistrarCommand.java @@ -27,19 +27,15 @@ import static google.registry.tools.RegistryToolEnvironment.SANDBOX; import static google.registry.tools.RegistryToolEnvironment.UNITTEST; import static google.registry.util.RegistrarUtils.normalizeClientId; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; - import google.registry.model.registrar.Registrar; import google.registry.tools.Command.GtechCommand; - import java.util.List; - import javax.annotation.Nullable; /** Command to create a Registrar. */ diff --git a/java/google/registry/tools/CreateRegistrarGroupsCommand.java b/java/google/registry/tools/CreateRegistrarGroupsCommand.java index ec694c8af..b66336997 100644 --- a/java/google/registry/tools/CreateRegistrarGroupsCommand.java +++ b/java/google/registry/tools/CreateRegistrarGroupsCommand.java @@ -17,18 +17,15 @@ package google.registry.tools; import static com.google.common.collect.Iterables.transform; import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; - import google.registry.model.registrar.Registrar; import google.registry.tools.Command.GtechCommand; import google.registry.tools.server.CreateGroupsAction; - import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/java/google/registry/tools/CreateReservedListCommand.java b/java/google/registry/tools/CreateReservedListCommand.java index 937251d40..d4ed51a6b 100644 --- a/java/google/registry/tools/CreateReservedListCommand.java +++ b/java/google/registry/tools/CreateReservedListCommand.java @@ -20,19 +20,15 @@ import static google.registry.util.ListNamingUtils.convertFilePathToName; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.DateTimeZone.UTC; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Splitter; import com.google.common.base.Strings; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; - import google.registry.model.registry.label.ReservedList; - -import org.joda.time.DateTime; - import java.nio.file.Files; import java.util.List; +import org.joda.time.DateTime; /** Command to create a {@link ReservedList} on Datastore. */ @Parameters(separators = " =", commandDescription = "Create a ReservedList in datastore.") diff --git a/java/google/registry/tools/CreateSandboxTldCommand.java b/java/google/registry/tools/CreateSandboxTldCommand.java index 38e3ec370..877e291c5 100644 --- a/java/google/registry/tools/CreateSandboxTldCommand.java +++ b/java/google/registry/tools/CreateSandboxTldCommand.java @@ -17,7 +17,6 @@ package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import com.beust.jcommander.Parameters; - import google.registry.config.RegistryEnvironment; import google.registry.tools.Command.GtechCommand; diff --git a/java/google/registry/tools/CreateTldCommand.java b/java/google/registry/tools/CreateTldCommand.java index c16087ab4..7e420c50f 100644 --- a/java/google/registry/tools/CreateTldCommand.java +++ b/java/google/registry/tools/CreateTldCommand.java @@ -20,21 +20,17 @@ import static google.registry.model.registry.Registries.getTlds; import static google.registry.util.CollectionUtils.nullToEmpty; import static google.registry.util.DateTimeUtils.START_OF_TIME; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; - import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.TldState; - +import javax.annotation.Nullable; import org.joda.money.CurrencyUnit; import org.joda.money.Money; -import javax.annotation.Nullable; - /** Command to create a TLD. */ @Parameters(separators = " =", commandDescription = "Create new TLD(s)") class CreateTldCommand extends CreateOrUpdateTldCommand { diff --git a/java/google/registry/tools/DeleteCreditCommand.java b/java/google/registry/tools/DeleteCreditCommand.java index 05f924fad..8b2ae23e4 100644 --- a/java/google/registry/tools/DeleteCreditCommand.java +++ b/java/google/registry/tools/DeleteCreditCommand.java @@ -19,7 +19,6 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - import google.registry.model.billing.RegistrarCredit; import google.registry.model.billing.RegistrarCreditBalance; import google.registry.model.registrar.Registrar; diff --git a/java/google/registry/tools/DeleteDomainCommand.java b/java/google/registry/tools/DeleteDomainCommand.java index ba48c1c58..5380d4974 100644 --- a/java/google/registry/tools/DeleteDomainCommand.java +++ b/java/google/registry/tools/DeleteDomainCommand.java @@ -14,11 +14,9 @@ package google.registry.tools; -import com.google.template.soy.data.SoyMapData; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.template.soy.data.SoyMapData; import google.registry.tools.Command.GtechCommand; import google.registry.tools.soy.DeleteDomainSoyInfo; diff --git a/java/google/registry/tools/DeleteEntityCommand.java b/java/google/registry/tools/DeleteEntityCommand.java index 7309079f6..728d1a62c 100644 --- a/java/google/registry/tools/DeleteEntityCommand.java +++ b/java/google/registry/tools/DeleteEntityCommand.java @@ -14,15 +14,12 @@ package google.registry.tools; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; - import google.registry.tools.server.DeleteEntityAction; - import java.util.List; /** diff --git a/java/google/registry/tools/DeleteEppResourceCommand.java b/java/google/registry/tools/DeleteEppResourceCommand.java index 0be83bce8..c7d67aa9b 100644 --- a/java/google/registry/tools/DeleteEppResourceCommand.java +++ b/java/google/registry/tools/DeleteEppResourceCommand.java @@ -18,22 +18,18 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.util.DateTimeUtils.isBeforeOrAt; import static org.joda.time.DateTimeZone.UTC; -import com.google.common.base.MoreObjects; -import com.google.common.collect.ImmutableList; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import com.google.common.base.MoreObjects; +import com.google.common.collect.ImmutableList; import com.googlecode.objectify.Key; - import google.registry.model.EppResource; import google.registry.model.index.ForeignKeyIndex; import google.registry.model.reporting.HistoryEntry; import google.registry.tools.params.EppResourceTypeParameter; - -import org.joda.time.DateTime; - import java.util.List; import java.util.Map; +import org.joda.time.DateTime; /** Command to soft-delete a list of EppResources of a given type specified by ROIDs. */ @Parameters(separators = " =", commandDescription = "Soft-delete EPP resources.") diff --git a/java/google/registry/tools/DeletePremiumListCommand.java b/java/google/registry/tools/DeletePremiumListCommand.java index 9e067f4bb..8d5e300e5 100644 --- a/java/google/registry/tools/DeletePremiumListCommand.java +++ b/java/google/registry/tools/DeletePremiumListCommand.java @@ -16,15 +16,12 @@ package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableSet; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableSet; import google.registry.model.registry.label.PremiumList; import google.registry.tools.Command.RemoteApiCommand; - import javax.annotation.Nullable; /** diff --git a/java/google/registry/tools/DeleteReservedListCommand.java b/java/google/registry/tools/DeleteReservedListCommand.java index d35f0fbee..c01c6bc2b 100644 --- a/java/google/registry/tools/DeleteReservedListCommand.java +++ b/java/google/registry/tools/DeleteReservedListCommand.java @@ -16,12 +16,10 @@ package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableSet; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableSet; import google.registry.model.registry.label.ReservedList; /** diff --git a/java/google/registry/tools/DomainApplicationInfoCommand.java b/java/google/registry/tools/DomainApplicationInfoCommand.java index 109ebaf17..70ecaee6a 100644 --- a/java/google/registry/tools/DomainApplicationInfoCommand.java +++ b/java/google/registry/tools/DomainApplicationInfoCommand.java @@ -16,11 +16,9 @@ package google.registry.tools; import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; -import com.google.template.soy.data.SoyMapData; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.template.soy.data.SoyMapData; import google.registry.model.domain.launch.LaunchPhase; import google.registry.tools.Command.GtechCommand; import google.registry.tools.soy.DomainApplicationInfoSoyInfo; diff --git a/java/google/registry/tools/DomainCheckClaimsCommand.java b/java/google/registry/tools/DomainCheckClaimsCommand.java index fba53d58b..375804afc 100644 --- a/java/google/registry/tools/DomainCheckClaimsCommand.java +++ b/java/google/registry/tools/DomainCheckClaimsCommand.java @@ -14,15 +14,12 @@ package google.registry.tools; -import com.google.common.collect.Multimap; -import com.google.template.soy.data.SoyMapData; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.collect.Multimap; +import com.google.template.soy.data.SoyMapData; import google.registry.tools.Command.GtechCommand; import google.registry.tools.soy.DomainCheckClaimsSoyInfo; - import java.util.Collection; import java.util.List; diff --git a/java/google/registry/tools/DomainCheckCommand.java b/java/google/registry/tools/DomainCheckCommand.java index 199a81765..b3d973013 100644 --- a/java/google/registry/tools/DomainCheckCommand.java +++ b/java/google/registry/tools/DomainCheckCommand.java @@ -14,15 +14,12 @@ package google.registry.tools; -import com.google.common.collect.Multimap; -import com.google.template.soy.data.SoyMapData; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.collect.Multimap; +import com.google.template.soy.data.SoyMapData; import google.registry.tools.Command.GtechCommand; import google.registry.tools.soy.DomainCheckSoyInfo; - import java.util.Collection; import java.util.List; diff --git a/java/google/registry/tools/DomainCheckFeeCommand.java b/java/google/registry/tools/DomainCheckFeeCommand.java index 3a65fe6db..ea15a3d82 100644 --- a/java/google/registry/tools/DomainCheckFeeCommand.java +++ b/java/google/registry/tools/DomainCheckFeeCommand.java @@ -14,15 +14,12 @@ package google.registry.tools; -import com.google.common.collect.Multimap; -import com.google.template.soy.data.SoyMapData; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.collect.Multimap; +import com.google.template.soy.data.SoyMapData; import google.registry.tools.Command.GtechCommand; import google.registry.tools.soy.DomainCheckFeeSoyInfo; - import java.util.Collection; import java.util.List; diff --git a/java/google/registry/tools/EncryptEscrowDepositCommand.java b/java/google/registry/tools/EncryptEscrowDepositCommand.java index 48228e8bb..2413dbf35 100644 --- a/java/google/registry/tools/EncryptEscrowDepositCommand.java +++ b/java/google/registry/tools/EncryptEscrowDepositCommand.java @@ -18,12 +18,9 @@ import static google.registry.util.DomainNameUtils.canonicalizeDomainName; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - import google.registry.tools.params.PathParameter; - import java.nio.file.Path; import java.nio.file.Paths; - import javax.inject.Inject; /** Command to encrypt an escrow deposit. */ diff --git a/java/google/registry/tools/EppToolCommand.java b/java/google/registry/tools/EppToolCommand.java index 156d09247..517b71a62 100644 --- a/java/google/registry/tools/EppToolCommand.java +++ b/java/google/registry/tools/EppToolCommand.java @@ -26,6 +26,7 @@ import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import static google.registry.xml.XmlTransformer.prettyPrint; import static java.nio.charset.StandardCharsets.UTF_8; +import com.beust.jcommander.Parameter; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -37,11 +38,7 @@ import com.google.template.soy.SoyFileSet; import com.google.template.soy.data.SoyRecord; import com.google.template.soy.parseinfo.SoyFileInfo; import com.google.template.soy.parseinfo.SoyTemplateInfo; - -import com.beust.jcommander.Parameter; - import google.registry.model.registrar.Registrar; - import java.io.IOException; import java.net.URLEncoder; import java.util.ArrayList; diff --git a/java/google/registry/tools/EscrowDepositEncryptor.java b/java/google/registry/tools/EscrowDepositEncryptor.java index 4dffef4a4..b5e214d07 100644 --- a/java/google/registry/tools/EscrowDepositEncryptor.java +++ b/java/google/registry/tools/EscrowDepositEncryptor.java @@ -17,7 +17,6 @@ package google.registry.tools; import static google.registry.model.rde.RdeMode.FULL; import com.google.common.io.ByteStreams; - import google.registry.keyring.api.KeyModule.Key; import google.registry.model.rde.RdeNamingUtils; import google.registry.rde.RdeUtil; @@ -32,21 +31,18 @@ import google.registry.rde.RydePgpSigningOutputStreamFactory; import google.registry.rde.RydeTarOutputStream; import google.registry.rde.RydeTarOutputStreamFactory; import google.registry.xml.XmlException; - -import org.bouncycastle.bcpg.ArmoredOutputStream; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.joda.time.DateTime; - import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.Path; - import javax.inject.Inject; +import org.bouncycastle.bcpg.ArmoredOutputStream; +import org.bouncycastle.openpgp.PGPException; +import org.bouncycastle.openpgp.PGPKeyPair; +import org.bouncycastle.openpgp.PGPPublicKey; +import org.joda.time.DateTime; /** Utility for encrypting an RDE RyDE deposit on the Java 7 NIO file system. */ final class EscrowDepositEncryptor { diff --git a/java/google/registry/tools/ExecuteEppCommand.java b/java/google/registry/tools/ExecuteEppCommand.java index 73b46ebe3..ce5e27202 100644 --- a/java/google/registry/tools/ExecuteEppCommand.java +++ b/java/google/registry/tools/ExecuteEppCommand.java @@ -16,14 +16,11 @@ package google.registry.tools; import static java.nio.charset.StandardCharsets.UTF_8; -import com.google.common.io.CharStreams; -import com.google.common.io.Files; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.io.CharStreams; +import com.google.common.io.Files; import google.registry.util.NonFinalForTesting; - import java.io.File; import java.io.IOException; import java.io.InputStream; diff --git a/java/google/registry/tools/GenerateApplicationsReportCommand.java b/java/google/registry/tools/GenerateApplicationsReportCommand.java index c3756684a..4ffd44713 100644 --- a/java/google/registry/tools/GenerateApplicationsReportCommand.java +++ b/java/google/registry/tools/GenerateApplicationsReportCommand.java @@ -23,15 +23,13 @@ import static google.registry.util.DomainNameUtils.ACE_PREFIX; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Collections.emptyList; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.net.InternetDomainName; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; import com.googlecode.objectify.cmd.LoadType; import com.googlecode.objectify.cmd.Query; - import google.registry.flows.EppException; import google.registry.model.domain.DomainApplication; import google.registry.model.smd.EncodedSignedMark; @@ -44,17 +42,14 @@ import google.registry.tools.Command.RemoteApiCommand; import google.registry.tools.params.PathParameter; import google.registry.util.Clock; import google.registry.util.Idn; - -import org.joda.time.DateTime; - import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; - import javax.annotation.CheckReturnValue; import javax.inject.Inject; +import org.joda.time.DateTime; /** Command to generate a report of all domain applications. */ @Parameters(separators = " =", commandDescription = "Generate report of all domain applications.") diff --git a/java/google/registry/tools/GenerateAuctionDataCommand.java b/java/google/registry/tools/GenerateAuctionDataCommand.java index d630bc1ae..fc23bda8b 100644 --- a/java/google/registry/tools/GenerateAuctionDataCommand.java +++ b/java/google/registry/tools/GenerateAuctionDataCommand.java @@ -26,6 +26,8 @@ import static google.registry.util.DateTimeUtils.isAtOrAfter; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.DateTimeZone.UTC; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; @@ -33,10 +35,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Multimap; import com.google.common.collect.Ordering; import com.google.common.collect.TreeMultimap; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; - import google.registry.model.contact.ContactAddress; import google.registry.model.contact.ContactPhoneNumber; import google.registry.model.contact.ContactResource; @@ -49,11 +47,6 @@ import google.registry.model.registrar.RegistrarContact; import google.registry.tools.Command.GtechCommand; import google.registry.tools.Command.RemoteApiCommand; import google.registry.tools.params.PathParameter; - -import org.joda.time.DateTime; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; - import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -65,6 +58,9 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; +import org.joda.time.DateTime; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; /** Command to generate the auction data for a TLD. */ @Parameters(separators = " =", commandDescription = "Generate auction data") diff --git a/java/google/registry/tools/GenerateDnsReportCommand.java b/java/google/registry/tools/GenerateDnsReportCommand.java index 4bc2e960f..71ddbe5ef 100644 --- a/java/google/registry/tools/GenerateDnsReportCommand.java +++ b/java/google/registry/tools/GenerateDnsReportCommand.java @@ -20,15 +20,13 @@ import static google.registry.model.registry.Registries.assertTldExists; import static google.registry.util.DateTimeUtils.isBeforeOrAt; import static java.nio.charset.StandardCharsets.US_ASCII; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Ordering; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; - import google.registry.model.domain.DomainResource; import google.registry.model.domain.secdns.DelegationSignerData; import google.registry.model.host.HostResource; @@ -36,17 +34,14 @@ import google.registry.tools.Command.GtechCommand; import google.registry.tools.Command.RemoteApiCommand; import google.registry.tools.params.PathParameter; import google.registry.util.Clock; - -import org.joda.time.DateTime; -import org.json.simple.JSONValue; - import java.net.InetAddress; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Map; - import javax.inject.Inject; +import org.joda.time.DateTime; +import org.json.simple.JSONValue; /** Command to generate a report of all DNS data. */ @Parameters(separators = " =", commandDescription = "Generate report of all DNS data in a TLD.") diff --git a/java/google/registry/tools/GenerateEscrowDepositCommand.java b/java/google/registry/tools/GenerateEscrowDepositCommand.java index c9955b79e..27a1057ad 100644 --- a/java/google/registry/tools/GenerateEscrowDepositCommand.java +++ b/java/google/registry/tools/GenerateEscrowDepositCommand.java @@ -20,17 +20,15 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; import static org.joda.time.DateTimeZone.UTC; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.base.Function; import com.google.common.base.Predicates; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; import com.googlecode.objectify.Key; import com.googlecode.objectify.Result; - import google.registry.config.ConfigModule.Config; import google.registry.model.EppResource; import google.registry.model.EppResourceUtils; @@ -54,9 +52,6 @@ import google.registry.tools.params.DateTimeParameter; import google.registry.tools.params.PathParameter; import google.registry.xjc.rdeheader.XjcRdeHeader; import google.registry.xjc.rdeheader.XjcRdeHeaderElement; - -import org.joda.time.DateTime; - import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; @@ -64,8 +59,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; - import javax.inject.Inject; +import org.joda.time.DateTime; /** Command to generate an XML RDE escrow deposit (with relevant files) in current directory. */ @Parameters(separators = " =", commandDescription = "Generate an XML escrow deposit.") diff --git a/java/google/registry/tools/GenerateLordnCommand.java b/java/google/registry/tools/GenerateLordnCommand.java index 059287a23..26604b66a 100644 --- a/java/google/registry/tools/GenerateLordnCommand.java +++ b/java/google/registry/tools/GenerateLordnCommand.java @@ -18,21 +18,17 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.DateTimeZone.UTC; -import com.google.common.collect.ImmutableList; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.collect.ImmutableList; import google.registry.model.domain.DomainResource; import google.registry.tmch.LordnTask; import google.registry.tools.Command.RemoteApiCommand; import google.registry.tools.params.PathParameter; - -import org.joda.time.DateTime; - import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import org.joda.time.DateTime; /** Command to generate a LORDN CSV file for an entire TLD. */ @Parameters(separators = " =", commandDescription = "Generate LORDN CSV file") diff --git a/java/google/registry/tools/GenerateZoneFilesCommand.java b/java/google/registry/tools/GenerateZoneFilesCommand.java index eea076806..cb7e76ab1 100644 --- a/java/google/registry/tools/GenerateZoneFilesCommand.java +++ b/java/google/registry/tools/GenerateZoneFilesCommand.java @@ -18,19 +18,15 @@ import static google.registry.model.registry.Registries.assertTldExists; import static org.joda.time.DateTimeZone.UTC; import static org.joda.time.Duration.standardMinutes; -import com.google.common.collect.ImmutableMap; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.collect.ImmutableMap; import google.registry.tools.params.DateTimeParameter; import google.registry.tools.server.GenerateZoneFilesAction; - -import org.joda.time.DateTime; - import java.io.IOException; import java.util.List; import java.util.Map; +import org.joda.time.DateTime; /** Command to generate zone files. */ @Parameters(separators = " =", commandDescription = "Generate zone files") diff --git a/java/google/registry/tools/GetApplicationCommand.java b/java/google/registry/tools/GetApplicationCommand.java index e068fa236..77868e92b 100644 --- a/java/google/registry/tools/GetApplicationCommand.java +++ b/java/google/registry/tools/GetApplicationCommand.java @@ -16,10 +16,8 @@ package google.registry.tools; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - import google.registry.model.domain.DomainApplication; import google.registry.tools.Command.GtechCommand; - import java.util.List; /** Command to show a domain application. */ diff --git a/java/google/registry/tools/GetApplicationIdsCommand.java b/java/google/registry/tools/GetApplicationIdsCommand.java index e38eb568c..4979e91d5 100644 --- a/java/google/registry/tools/GetApplicationIdsCommand.java +++ b/java/google/registry/tools/GetApplicationIdsCommand.java @@ -18,16 +18,13 @@ import static google.registry.model.index.DomainApplicationIndex.loadActiveAppli import static google.registry.model.registry.Registries.assertTldExists; import static google.registry.model.registry.Registries.findTldForNameOrThrow; -import com.google.common.collect.ImmutableList; -import com.google.common.net.InternetDomainName; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.collect.ImmutableList; +import com.google.common.net.InternetDomainName; import google.registry.model.domain.DomainApplication; import google.registry.tools.Command.GtechCommand; import google.registry.tools.Command.RemoteApiCommand; - import java.util.List; /** Command to generate a list of all applications for a given domain name(s). */ diff --git a/java/google/registry/tools/GetAppliedLabelsCommand.java b/java/google/registry/tools/GetAppliedLabelsCommand.java index 168772cc3..7af8a2228 100644 --- a/java/google/registry/tools/GetAppliedLabelsCommand.java +++ b/java/google/registry/tools/GetAppliedLabelsCommand.java @@ -24,22 +24,19 @@ import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.beust.jcommander.internal.Sets; import com.googlecode.objectify.Work; - import google.registry.model.domain.DomainApplication; import google.registry.model.domain.launch.ApplicationStatus; import google.registry.tools.Command.GtechCommand; import google.registry.tools.Command.RemoteApiCommand; import google.registry.tools.params.PathParameter; import google.registry.util.Idn; - -import org.joda.time.DateTime; - import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; import java.util.Set; +import org.joda.time.DateTime; /** Command to generate a list of all slds in a tld that have open applications. */ @Parameters(separators = " =", commandDescription = "Generate applied-for domains list") diff --git a/java/google/registry/tools/GetClaimsListCommand.java b/java/google/registry/tools/GetClaimsListCommand.java index 554252691..3ba356417 100644 --- a/java/google/registry/tools/GetClaimsListCommand.java +++ b/java/google/registry/tools/GetClaimsListCommand.java @@ -17,16 +17,13 @@ package google.registry.tools; import static com.google.common.base.Preconditions.checkNotNull; import static java.nio.charset.StandardCharsets.UTF_8; -import com.google.common.base.Joiner; -import com.google.common.io.Files; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.base.Joiner; +import com.google.common.io.Files; import google.registry.model.tmch.ClaimsListShard; import google.registry.tools.Command.RemoteApiCommand; import google.registry.tools.params.PathParameter; - import java.nio.file.Path; import java.nio.file.Paths; diff --git a/java/google/registry/tools/GetContactCommand.java b/java/google/registry/tools/GetContactCommand.java index 659043006..e5327f152 100644 --- a/java/google/registry/tools/GetContactCommand.java +++ b/java/google/registry/tools/GetContactCommand.java @@ -16,10 +16,8 @@ package google.registry.tools; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - import google.registry.model.contact.ContactResource; import google.registry.tools.Command.GtechCommand; - import java.util.List; /** Command to show one or more contacts. */ diff --git a/java/google/registry/tools/GetDomainCommand.java b/java/google/registry/tools/GetDomainCommand.java index 8e4668192..26e9a9cb1 100644 --- a/java/google/registry/tools/GetDomainCommand.java +++ b/java/google/registry/tools/GetDomainCommand.java @@ -16,10 +16,8 @@ package google.registry.tools; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - import google.registry.model.domain.DomainResource; import google.registry.tools.Command.GtechCommand; - import java.util.List; /** Command to show a domain resource. */ diff --git a/java/google/registry/tools/GetEppResourceCommand.java b/java/google/registry/tools/GetEppResourceCommand.java index 21f482aca..ddb835631 100644 --- a/java/google/registry/tools/GetEppResourceCommand.java +++ b/java/google/registry/tools/GetEppResourceCommand.java @@ -21,11 +21,9 @@ import static org.joda.time.DateTimeZone.UTC; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.googlecode.objectify.Key; - import google.registry.model.EppResource; import google.registry.tools.Command.RemoteApiCommand; import google.registry.util.TypeUtils.TypeInstantiator; - import org.joda.time.DateTime; /** diff --git a/java/google/registry/tools/GetHistoryEntriesCommand.java b/java/google/registry/tools/GetHistoryEntriesCommand.java index d61ffa9c6..4d4c0f960 100644 --- a/java/google/registry/tools/GetHistoryEntriesCommand.java +++ b/java/google/registry/tools/GetHistoryEntriesCommand.java @@ -20,12 +20,10 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - import google.registry.model.reporting.HistoryEntry; import google.registry.tools.Command.GtechCommand; import google.registry.tools.Command.RemoteApiCommand; import google.registry.xml.XmlTransformer; - import org.joda.time.DateTime; /** Command to show history entries. */ diff --git a/java/google/registry/tools/GetHostCommand.java b/java/google/registry/tools/GetHostCommand.java index 25033c160..9e7a28bf9 100644 --- a/java/google/registry/tools/GetHostCommand.java +++ b/java/google/registry/tools/GetHostCommand.java @@ -16,10 +16,8 @@ package google.registry.tools; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - import google.registry.model.host.HostResource; import google.registry.tools.Command.GtechCommand; - import java.util.List; /** Command to show one or more host resources. */ diff --git a/java/google/registry/tools/GetRegistrarCommand.java b/java/google/registry/tools/GetRegistrarCommand.java index 5159cbfcb..b968d1a74 100644 --- a/java/google/registry/tools/GetRegistrarCommand.java +++ b/java/google/registry/tools/GetRegistrarCommand.java @@ -18,11 +18,9 @@ import static com.google.common.base.Preconditions.checkState; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - import google.registry.model.registrar.Registrar; import google.registry.tools.Command.GtechCommand; import google.registry.tools.Command.RemoteApiCommand; - import java.util.List; /** Command to show a registrar record. */ diff --git a/java/google/registry/tools/GetResourceByKeyCommand.java b/java/google/registry/tools/GetResourceByKeyCommand.java index 796ef4b21..ce835ee75 100644 --- a/java/google/registry/tools/GetResourceByKeyCommand.java +++ b/java/google/registry/tools/GetResourceByKeyCommand.java @@ -20,10 +20,8 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.googlecode.objectify.Key; - import google.registry.model.EppResource; import google.registry.tools.Command.RemoteApiCommand; - import java.util.List; /** diff --git a/java/google/registry/tools/GetSchemaCommand.java b/java/google/registry/tools/GetSchemaCommand.java index 927cd6a56..1761aa53e 100644 --- a/java/google/registry/tools/GetSchemaCommand.java +++ b/java/google/registry/tools/GetSchemaCommand.java @@ -15,7 +15,6 @@ package google.registry.tools; import com.beust.jcommander.Parameters; - import google.registry.model.SchemaVersion; import google.registry.tools.Command.GtechCommand; diff --git a/java/google/registry/tools/GetSchemaTreeCommand.java b/java/google/registry/tools/GetSchemaTreeCommand.java index 56c0c9d8a..a8df26f5a 100644 --- a/java/google/registry/tools/GetSchemaTreeCommand.java +++ b/java/google/registry/tools/GetSchemaTreeCommand.java @@ -19,22 +19,19 @@ import static google.registry.model.EntityClasses.ALL_CLASSES; import static java.lang.ClassLoader.getSystemClassLoader; import static java.lang.reflect.Modifier.isAbstract; +import com.beust.jcommander.Parameters; import com.google.common.base.Strings; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.collect.Ordering; import com.google.common.collect.TreeMultimap; - -import com.beust.jcommander.Parameters; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.EntitySubclass; import com.googlecode.objectify.annotation.Parent; - import google.registry.model.BackupGroupRoot; import google.registry.model.annotations.NotBackedUp; import google.registry.model.annotations.VirtualEntity; import google.registry.tools.Command.GtechCommand; - import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; diff --git a/java/google/registry/tools/GetTldCommand.java b/java/google/registry/tools/GetTldCommand.java index f6274232a..55f3e4f17 100644 --- a/java/google/registry/tools/GetTldCommand.java +++ b/java/google/registry/tools/GetTldCommand.java @@ -18,11 +18,9 @@ import static google.registry.model.registry.Registries.assertTldExists; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - import google.registry.model.registry.Registry; import google.registry.tools.Command.GtechCommand; import google.registry.tools.Command.RemoteApiCommand; - import java.util.List; /** Command to show a TLD record. */ diff --git a/java/google/registry/tools/GhostrydeCommand.java b/java/google/registry/tools/GhostrydeCommand.java index a8a085f0c..ce43fd11c 100644 --- a/java/google/registry/tools/GhostrydeCommand.java +++ b/java/google/registry/tools/GhostrydeCommand.java @@ -18,20 +18,12 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; import static org.joda.time.DateTimeZone.UTC; -import com.google.common.io.ByteStreams; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.io.ByteStreams; import google.registry.keyring.api.KeyModule.Key; import google.registry.rde.Ghostryde; import google.registry.tools.params.PathParameter; - -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.joda.time.DateTime; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -39,8 +31,11 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.attribute.FileTime; - import javax.inject.Inject; +import org.bouncycastle.openpgp.PGPException; +import org.bouncycastle.openpgp.PGPPrivateKey; +import org.bouncycastle.openpgp.PGPPublicKey; +import org.joda.time.DateTime; /** Command to encrypt/decrypt {@code .ghostryde} files. */ @Parameters(separators = " =", commandDescription = "Encrypt/decrypt a ghostryde file.") diff --git a/java/google/registry/tools/GtechTool.java b/java/google/registry/tools/GtechTool.java index a91ad68d7..2736576c3 100644 --- a/java/google/registry/tools/GtechTool.java +++ b/java/google/registry/tools/GtechTool.java @@ -16,7 +16,6 @@ package google.registry.tools; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedMap; - import google.registry.tools.Command.GtechCommand; /** Command line interface with a subset of commands that are safe for tech support to run. */ diff --git a/java/google/registry/tools/HashCertificateCommand.java b/java/google/registry/tools/HashCertificateCommand.java index 21d1b6123..6097ded4f 100644 --- a/java/google/registry/tools/HashCertificateCommand.java +++ b/java/google/registry/tools/HashCertificateCommand.java @@ -18,13 +18,10 @@ import static com.google.common.base.Preconditions.checkArgument; import static google.registry.util.X509Utils.getCertificateHash; import static google.registry.util.X509Utils.loadCertificate; -import com.google.common.base.Joiner; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.base.Joiner; import google.registry.tools.Command.GtechCommand; - import java.io.IOException; import java.nio.file.Paths; import java.security.cert.CertificateParsingException; diff --git a/java/google/registry/tools/HelpCommand.java b/java/google/registry/tools/HelpCommand.java index 99adae2ed..d0082ccdc 100644 --- a/java/google/registry/tools/HelpCommand.java +++ b/java/google/registry/tools/HelpCommand.java @@ -19,7 +19,6 @@ import static com.google.common.collect.Iterables.getOnlyElement; import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - import java.util.ArrayList; import java.util.List; diff --git a/java/google/registry/tools/ListCreditsCommand.java b/java/google/registry/tools/ListCreditsCommand.java index 51977ce4c..b683e9d80 100644 --- a/java/google/registry/tools/ListCreditsCommand.java +++ b/java/google/registry/tools/ListCreditsCommand.java @@ -16,20 +16,17 @@ package google.registry.tools; import static google.registry.model.ofy.ObjectifyService.ofy; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; import com.googlecode.objectify.Work; - import google.registry.model.billing.RegistrarCredit; import google.registry.model.billing.RegistrarCreditBalance.BalanceMap; import google.registry.model.registrar.Registrar; import google.registry.tools.Command.GtechCommand; import google.registry.tools.Command.RemoteApiCommand; - import org.joda.money.Money; /** Command to list registrar credits and balances. */ diff --git a/java/google/registry/tools/ListCursorsCommand.java b/java/google/registry/tools/ListCursorsCommand.java index f36b9d349..138de25ee 100644 --- a/java/google/registry/tools/ListCursorsCommand.java +++ b/java/google/registry/tools/ListCursorsCommand.java @@ -16,18 +16,15 @@ package google.registry.tools; import static google.registry.model.ofy.ObjectifyService.ofy; -import com.google.common.collect.Ordering; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.collect.Ordering; import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; import google.registry.model.registry.Registries; import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.TldType; import google.registry.tools.Command.RemoteApiCommand; - import java.util.ArrayList; import java.util.List; diff --git a/java/google/registry/tools/ListDomainsCommand.java b/java/google/registry/tools/ListDomainsCommand.java index 214ff6f96..5b777df9b 100644 --- a/java/google/registry/tools/ListDomainsCommand.java +++ b/java/google/registry/tools/ListDomainsCommand.java @@ -14,11 +14,9 @@ package google.registry.tools; -import com.google.common.collect.ImmutableMap; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.collect.ImmutableMap; import google.registry.tools.server.ListDomainsAction; /** Command to list all second-level domains associated with a TLD. */ diff --git a/java/google/registry/tools/ListHostsCommand.java b/java/google/registry/tools/ListHostsCommand.java index 8189bd00d..88adea476 100644 --- a/java/google/registry/tools/ListHostsCommand.java +++ b/java/google/registry/tools/ListHostsCommand.java @@ -15,7 +15,6 @@ package google.registry.tools; import com.beust.jcommander.Parameters; - import google.registry.tools.server.ListHostsAction; /** Command to list all HostResource entities associated with a TLD. */ diff --git a/java/google/registry/tools/ListObjectsCommand.java b/java/google/registry/tools/ListObjectsCommand.java index 2e4dc38ed..aabe07a41 100644 --- a/java/google/registry/tools/ListObjectsCommand.java +++ b/java/google/registry/tools/ListObjectsCommand.java @@ -19,20 +19,15 @@ import static google.registry.tools.server.ListObjectsAction.FIELDS_PARAM; import static google.registry.tools.server.ListObjectsAction.FULL_FIELD_NAMES_PARAM; import static google.registry.tools.server.ListObjectsAction.PRINT_HEADER_ROW_PARAM; +import com.beust.jcommander.Parameter; import com.google.common.base.VerifyException; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; - -import com.beust.jcommander.Parameter; - import google.registry.tools.Command.RemoteApiCommand; - -import org.json.simple.JSONValue; - import java.util.List; import java.util.Map; - import javax.annotation.Nullable; +import org.json.simple.JSONValue; /** * Abstract base class for commands that list objects by calling a server task. diff --git a/java/google/registry/tools/ListPremiumListsCommand.java b/java/google/registry/tools/ListPremiumListsCommand.java index 192d31793..411074e31 100644 --- a/java/google/registry/tools/ListPremiumListsCommand.java +++ b/java/google/registry/tools/ListPremiumListsCommand.java @@ -15,7 +15,6 @@ package google.registry.tools; import com.beust.jcommander.Parameters; - import google.registry.tools.server.ListPremiumListsAction; /** Command to list all premium lists. */ diff --git a/java/google/registry/tools/ListRegistrarsCommand.java b/java/google/registry/tools/ListRegistrarsCommand.java index 48a9c75b4..c4c8f5a0b 100644 --- a/java/google/registry/tools/ListRegistrarsCommand.java +++ b/java/google/registry/tools/ListRegistrarsCommand.java @@ -15,7 +15,6 @@ package google.registry.tools; import com.beust.jcommander.Parameters; - import google.registry.tools.Command.GtechCommand; import google.registry.tools.server.ListRegistrarsAction; diff --git a/java/google/registry/tools/ListReservedListsCommand.java b/java/google/registry/tools/ListReservedListsCommand.java index 2033b69c8..4b38b2573 100644 --- a/java/google/registry/tools/ListReservedListsCommand.java +++ b/java/google/registry/tools/ListReservedListsCommand.java @@ -15,7 +15,6 @@ package google.registry.tools; import com.beust.jcommander.Parameters; - import google.registry.tools.server.ListReservedListsAction; /** Command to list all reserved lists. */ diff --git a/java/google/registry/tools/ListTldsCommand.java b/java/google/registry/tools/ListTldsCommand.java index e90d1f00c..186bea6ca 100644 --- a/java/google/registry/tools/ListTldsCommand.java +++ b/java/google/registry/tools/ListTldsCommand.java @@ -15,7 +15,6 @@ package google.registry.tools; import com.beust.jcommander.Parameters; - import google.registry.tools.Command.GtechCommand; import google.registry.tools.server.ListTldsAction; diff --git a/java/google/registry/tools/LoadSnapshotCommand.java b/java/google/registry/tools/LoadSnapshotCommand.java index 97dc6cec3..d8d8f1d50 100644 --- a/java/google/registry/tools/LoadSnapshotCommand.java +++ b/java/google/registry/tools/LoadSnapshotCommand.java @@ -16,19 +16,16 @@ package google.registry.tools; import static com.google.common.base.Predicates.notNull; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; - import google.registry.bigquery.BigqueryUtils.SourceFormat; import google.registry.export.ExportConstants; - import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/java/google/registry/tools/LoggingParameters.java b/java/google/registry/tools/LoggingParameters.java index 9be04a156..5ae7b4c5c 100644 --- a/java/google/registry/tools/LoggingParameters.java +++ b/java/google/registry/tools/LoggingParameters.java @@ -16,15 +16,12 @@ package google.registry.tools; import static google.registry.util.ResourceUtils.readResourceBytes; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.base.Joiner; import com.google.common.io.ByteSource; import com.google.common.io.Files; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; - import google.registry.tools.params.PathParameter; - import java.io.IOException; import java.io.InputStream; import java.nio.file.Path; @@ -32,7 +29,6 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Level; import java.util.logging.LogManager; - import javax.annotation.Nullable; /** Parameter delegate class to handle logging configuration for {@link RegistryCli}. */ diff --git a/java/google/registry/tools/MakeBillingTablesCommand.java b/java/google/registry/tools/MakeBillingTablesCommand.java index a57a99a5a..7252dfc77 100644 --- a/java/google/registry/tools/MakeBillingTablesCommand.java +++ b/java/google/registry/tools/MakeBillingTablesCommand.java @@ -18,16 +18,13 @@ import static com.google.common.base.Preconditions.checkArgument; import static google.registry.tools.BigqueryCommandUtilities.handleTableCreation; import static google.registry.util.ResourceUtils.readResourceUtf8; -import com.google.common.base.Joiner; -import com.google.common.base.Optional; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.base.Joiner; +import com.google.common.base.Optional; import google.registry.bigquery.BigqueryUtils.TableType; import google.registry.tools.BigqueryCommandUtilities.TableCreationException; import google.registry.util.SqlTemplate; - import java.util.List; /** Command to make synthetic billing tables and views in Bigquery. */ diff --git a/java/google/registry/tools/MutatingCommand.java b/java/google/registry/tools/MutatingCommand.java index b3eacb831..f42754751 100644 --- a/java/google/registry/tools/MutatingCommand.java +++ b/java/google/registry/tools/MutatingCommand.java @@ -32,20 +32,16 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; - import google.registry.model.ImmutableObject; import google.registry.tools.Command.RemoteApiCommand; - import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Objects; import java.util.Set; - import javax.annotation.Nullable; /** A {@link ConfirmingCommand} that changes objects in the datastore. */ diff --git a/java/google/registry/tools/PendingEscrowCommand.java b/java/google/registry/tools/PendingEscrowCommand.java index c8646e685..af55cc959 100644 --- a/java/google/registry/tools/PendingEscrowCommand.java +++ b/java/google/registry/tools/PendingEscrowCommand.java @@ -14,18 +14,15 @@ package google.registry.tools; +import com.beust.jcommander.Parameters; import com.google.common.base.Functions; import com.google.common.base.Joiner; import com.google.common.collect.ComparisonChain; import com.google.common.collect.FluentIterable; import com.google.common.collect.Ordering; - -import com.beust.jcommander.Parameters; - import google.registry.rde.PendingDeposit; import google.registry.rde.PendingDepositChecker; import google.registry.tools.Command.RemoteApiCommand; - import javax.inject.Inject; /** Command to show what escrow deposits are pending generation on the server. */ diff --git a/java/google/registry/tools/PublishDetailReportCommand.java b/java/google/registry/tools/PublishDetailReportCommand.java index ab3969044..8abf79dd4 100644 --- a/java/google/registry/tools/PublishDetailReportCommand.java +++ b/java/google/registry/tools/PublishDetailReportCommand.java @@ -16,15 +16,12 @@ package google.registry.tools; import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.collect.ImmutableMap; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.collect.ImmutableMap; import google.registry.export.PublishDetailReportAction; import google.registry.model.registrar.Registrar; import google.registry.tools.Command.GtechCommand; - import java.util.Map; /** diff --git a/java/google/registry/tools/RandomPasswordGenerator.java b/java/google/registry/tools/RandomPasswordGenerator.java index a5ed3e9d2..672ef179c 100644 --- a/java/google/registry/tools/RandomPasswordGenerator.java +++ b/java/google/registry/tools/RandomPasswordGenerator.java @@ -17,7 +17,6 @@ package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import java.util.Random; - import javax.inject.Inject; /** Password generator. */ diff --git a/java/google/registry/tools/RegistrarActivityReportCommand.java b/java/google/registry/tools/RegistrarActivityReportCommand.java index 9f3d7d286..e7abbccc2 100644 --- a/java/google/registry/tools/RegistrarActivityReportCommand.java +++ b/java/google/registry/tools/RegistrarActivityReportCommand.java @@ -17,26 +17,22 @@ package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static google.registry.util.ResourceUtils.readResourceUtf8; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; +import com.beust.jcommander.ParametersDelegate; import com.google.api.services.bigquery.model.Job; import com.google.api.services.bigquery.model.JobConfiguration; import com.google.api.services.bigquery.model.JobConfigurationExtract; import com.google.api.services.bigquery.model.JobConfigurationQuery; import com.google.common.collect.ImmutableList; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; -import com.beust.jcommander.ParametersDelegate; - import google.registry.bigquery.BigqueryConnection; import google.registry.tools.Command.GtechCommand; import google.registry.util.SqlTemplate; - +import java.nio.file.Path; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; -import java.nio.file.Path; - /** Command for creating a registrar activity report and saving it to cloud storage. */ @Parameters(separators = " =", commandDescription = "Generates a registrar activity report.") final class RegistrarActivityReportCommand implements GtechCommand { diff --git a/java/google/registry/tools/RegistrarContactCommand.java b/java/google/registry/tools/RegistrarContactCommand.java index 26b762d3c..7f54123d2 100644 --- a/java/google/registry/tools/RegistrarContactCommand.java +++ b/java/google/registry/tools/RegistrarContactCommand.java @@ -23,15 +23,13 @@ import static google.registry.util.CollectionUtils.nullToEmpty; import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import static java.nio.charset.StandardCharsets.UTF_8; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.base.Enums; import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; - import google.registry.model.common.GaeUserIdConverter; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; @@ -39,7 +37,6 @@ import google.registry.model.registrar.RegistrarContact.Builder; import google.registry.tools.Command.GtechCommand; import google.registry.tools.params.OptionalPhoneNumberParameter; import google.registry.tools.params.PathParameter; - import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -50,7 +47,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; - import javax.annotation.Nullable; /** Command for CRUD operations on {@link Registrar} contact list fields. */ diff --git a/java/google/registry/tools/RegistryCli.java b/java/google/registry/tools/RegistryCli.java index 7d7c8e63a..b0cad8929 100644 --- a/java/google/registry/tools/RegistryCli.java +++ b/java/google/registry/tools/RegistryCli.java @@ -17,25 +17,21 @@ package google.registry.tools; import static com.google.common.base.Preconditions.checkState; import static google.registry.tools.Injector.injectReflectively; -import com.google.appengine.tools.remoteapi.RemoteApiInstaller; -import com.google.appengine.tools.remoteapi.RemoteApiOptions; -import com.google.common.collect.ImmutableMap; - import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; import com.beust.jcommander.ParameterException; import com.beust.jcommander.Parameters; import com.beust.jcommander.ParametersDelegate; - +import com.google.appengine.tools.remoteapi.RemoteApiInstaller; +import com.google.appengine.tools.remoteapi.RemoteApiOptions; +import com.google.common.collect.ImmutableMap; import google.registry.model.ofy.ObjectifyService; import google.registry.tools.Command.RemoteApiCommand; import google.registry.tools.params.ParameterFactory; - -import org.bouncycastle.jce.provider.BouncyCastleProvider; - import java.security.Security; import java.util.HashMap; import java.util.Map; +import org.bouncycastle.jce.provider.BouncyCastleProvider; /** Container class to create and run remote commands against a datastore instance. */ @Parameters(separators = " =", commandDescription = "Command-line interface to the registry") diff --git a/java/google/registry/tools/RegistryTool.java b/java/google/registry/tools/RegistryTool.java index f03647bd1..b6d8734ea 100644 --- a/java/google/registry/tools/RegistryTool.java +++ b/java/google/registry/tools/RegistryTool.java @@ -17,7 +17,6 @@ package google.registry.tools; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedMap; - import google.registry.tools.javascrap.LoadAndResaveCommand; import google.registry.tools.javascrap.RemoveIpAddressCommand; diff --git a/java/google/registry/tools/RegistryToolComponent.java b/java/google/registry/tools/RegistryToolComponent.java index a6177df5d..8fd301f82 100644 --- a/java/google/registry/tools/RegistryToolComponent.java +++ b/java/google/registry/tools/RegistryToolComponent.java @@ -15,7 +15,6 @@ package google.registry.tools; import dagger.Component; - import google.registry.config.ConfigModule; import google.registry.keyring.api.KeyModule; import google.registry.keyring.api.VoidKeyringModule; diff --git a/java/google/registry/tools/RegistryToolEnvironment.java b/java/google/registry/tools/RegistryToolEnvironment.java index ac519e32f..7567cbfcf 100644 --- a/java/google/registry/tools/RegistryToolEnvironment.java +++ b/java/google/registry/tools/RegistryToolEnvironment.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkState; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import google.registry.config.RegistryEnvironment; /** Enum of production environments, used for the {@code --environment} flag. */ diff --git a/java/google/registry/tools/RegistryToolModule.java b/java/google/registry/tools/RegistryToolModule.java index 9d08369cf..3e0500318 100644 --- a/java/google/registry/tools/RegistryToolModule.java +++ b/java/google/registry/tools/RegistryToolModule.java @@ -17,7 +17,6 @@ package google.registry.tools; import dagger.Binds; import dagger.Module; import dagger.Provides; - import java.security.NoSuchAlgorithmException; import java.security.ProviderException; import java.security.SecureRandom; diff --git a/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java b/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java index ed10f8b2e..1bbe17fac 100644 --- a/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java +++ b/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java @@ -21,7 +21,6 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import com.beust.jcommander.Parameters; import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; - import google.registry.model.ImmutableObject; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; diff --git a/java/google/registry/tools/SendEscrowReportToIcannCommand.java b/java/google/registry/tools/SendEscrowReportToIcannCommand.java index 83172fc24..7d5b7477a 100644 --- a/java/google/registry/tools/SendEscrowReportToIcannCommand.java +++ b/java/google/registry/tools/SendEscrowReportToIcannCommand.java @@ -16,15 +16,12 @@ package google.registry.tools; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - import google.registry.rde.RdeReporter; import google.registry.tools.Command.RemoteApiCommand; import google.registry.tools.params.PathParameter; - import java.nio.file.Files; import java.nio.file.Path; import java.util.List; - import javax.inject.Inject; /** Command to send ICANN notification that an escrow deposit was uploaded. */ diff --git a/java/google/registry/tools/ServerSideCommand.java b/java/google/registry/tools/ServerSideCommand.java index ea3b5f17e..bf34200d1 100644 --- a/java/google/registry/tools/ServerSideCommand.java +++ b/java/google/registry/tools/ServerSideCommand.java @@ -15,9 +15,7 @@ package google.registry.tools; import com.google.common.net.MediaType; - import google.registry.tools.Command.RemoteApiCommand; - import java.io.IOException; import java.util.Map; diff --git a/java/google/registry/tools/SetupOteCommand.java b/java/google/registry/tools/SetupOteCommand.java index 434a83735..effb9869c 100644 --- a/java/google/registry/tools/SetupOteCommand.java +++ b/java/google/registry/tools/SetupOteCommand.java @@ -18,27 +18,22 @@ import static com.google.common.base.Preconditions.checkArgument; import static google.registry.tools.CommandUtilities.promptForYes; import static google.registry.util.X509Utils.loadCertificate; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.re2j.Pattern; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; - import google.registry.config.RegistryEnvironment; import google.registry.model.registrar.Registrar; import google.registry.model.registry.Registry.TldState; import google.registry.tools.Command.GtechCommand; import google.registry.tools.Command.RemoteApiCommand; import google.registry.tools.params.PathParameter; - -import org.joda.time.Duration; - import java.nio.file.Path; import java.util.ArrayList; import java.util.List; - import javax.inject.Inject; +import org.joda.time.Duration; /** Composite command to set up OT&E TLDs and accounts. */ @Parameters( diff --git a/java/google/registry/tools/UniformRapidSuspensionCommand.java b/java/google/registry/tools/UniformRapidSuspensionCommand.java index 9b6eabcaa..fde83b821 100644 --- a/java/google/registry/tools/UniformRapidSuspensionCommand.java +++ b/java/google/registry/tools/UniformRapidSuspensionCommand.java @@ -21,34 +21,29 @@ import static google.registry.model.EppResourceUtils.checkResourcesExist; import static google.registry.model.EppResourceUtils.loadByUniqueId; import static org.joda.time.DateTimeZone.UTC; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; import com.google.template.soy.data.SoyMapData; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; import com.googlecode.objectify.Ref; - import google.registry.model.domain.DomainResource; import google.registry.model.domain.secdns.DelegationSignerData; import google.registry.model.eppcommon.StatusValue; import google.registry.model.host.HostResource; import google.registry.tools.Command.GtechCommand; import google.registry.tools.soy.UniformRapidSuspensionSoyInfo; - -import org.joda.time.DateTime; -import org.json.simple.JSONArray; -import org.json.simple.JSONValue; -import org.json.simple.parser.ParseException; - import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; - import javax.xml.bind.annotation.adapters.HexBinaryAdapter; +import org.joda.time.DateTime; +import org.json.simple.JSONArray; +import org.json.simple.JSONValue; +import org.json.simple.parser.ParseException; /** A command to suspend a domain for the Uniform Rapid Suspension process. */ @Parameters(separators = " =", diff --git a/java/google/registry/tools/UpdateApplicationStatusCommand.java b/java/google/registry/tools/UpdateApplicationStatusCommand.java index f3f99c894..dfb0eb617 100644 --- a/java/google/registry/tools/UpdateApplicationStatusCommand.java +++ b/java/google/registry/tools/UpdateApplicationStatusCommand.java @@ -21,12 +21,10 @@ import static google.registry.model.domain.launch.ApplicationStatus.ALLOCATED; import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; -import com.google.common.collect.ImmutableList; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import com.google.common.collect.ImmutableList; import com.googlecode.objectify.VoidWork; - import google.registry.model.domain.DomainApplication; import google.registry.model.domain.launch.ApplicationStatus; import google.registry.model.domain.launch.LaunchInfoResponseExtension; @@ -36,10 +34,8 @@ import google.registry.model.poll.PendingActionNotificationResponse.DomainPendin import google.registry.model.poll.PollMessage; import google.registry.model.registrar.Registrar; import google.registry.model.reporting.HistoryEntry; - -import org.joda.time.DateTime; - import java.util.List; +import org.joda.time.DateTime; /** Command to manually update the status of a domain application. */ @Parameters(separators = " =", commandDescription = "Manually update domain application status.") diff --git a/java/google/registry/tools/UpdateClaimsNoticeCommand.java b/java/google/registry/tools/UpdateClaimsNoticeCommand.java index 7ae1d85c8..98a23c2e0 100644 --- a/java/google/registry/tools/UpdateClaimsNoticeCommand.java +++ b/java/google/registry/tools/UpdateClaimsNoticeCommand.java @@ -18,18 +18,15 @@ import static com.google.common.base.Preconditions.checkArgument; import static google.registry.model.EppResourceUtils.loadByUniqueId; import static google.registry.model.ofy.ObjectifyService.ofy; -import com.google.common.net.InternetDomainName; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import com.google.common.net.InternetDomainName; import com.googlecode.objectify.VoidWork; - import google.registry.model.domain.DomainApplication; import google.registry.model.domain.launch.LaunchNotice; import google.registry.model.domain.launch.LaunchNotice.InvalidChecksumException; import google.registry.model.reporting.HistoryEntry; import google.registry.tools.Command.RemoteApiCommand; - import org.joda.time.DateTime; /** Command to update the claims notice on a domain application. */ diff --git a/java/google/registry/tools/UpdateCreditsCommand.java b/java/google/registry/tools/UpdateCreditsCommand.java index b96e8ee34..b363fb22e 100644 --- a/java/google/registry/tools/UpdateCreditsCommand.java +++ b/java/google/registry/tools/UpdateCreditsCommand.java @@ -21,24 +21,20 @@ import static google.registry.bigquery.BigqueryUtils.fromBigqueryTimestampString import static google.registry.model.ofy.ObjectifyService.ofy; import static org.joda.time.DateTimeZone.UTC; -import com.google.common.base.Optional; -import com.google.common.base.Splitter; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.base.Optional; +import com.google.common.base.Splitter; import google.registry.model.billing.RegistrarCredit; import google.registry.model.billing.RegistrarCreditBalance; import google.registry.model.billing.RegistrarCreditBalance.BalanceMap; import google.registry.model.registrar.Registrar; - -import org.joda.money.Money; -import org.joda.time.DateTime; - import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.util.List; +import org.joda.money.Money; +import org.joda.time.DateTime; /** Command for writing out new balances of credits updated in an invoicing cycle. */ @Parameters(separators = " =", commandDescription = "Update a set of registrar credit balances") diff --git a/java/google/registry/tools/UpdateCursorsCommand.java b/java/google/registry/tools/UpdateCursorsCommand.java index 7e0f1531f..d5af1b1b3 100644 --- a/java/google/registry/tools/UpdateCursorsCommand.java +++ b/java/google/registry/tools/UpdateCursorsCommand.java @@ -18,15 +18,12 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; import google.registry.model.registry.Registry; import google.registry.tools.params.DateTimeParameter; - -import org.joda.time.DateTime; - import java.util.List; +import org.joda.time.DateTime; /** Modifies {@link Cursor} timestamps used by locking rolling cursor tasks, like in RDE. */ @Parameters(separators = " =", commandDescription = "Modifies cursor timestamps used by LRC tasks") diff --git a/java/google/registry/tools/UpdatePremiumListCommand.java b/java/google/registry/tools/UpdatePremiumListCommand.java index d983fbe9a..4543654c4 100644 --- a/java/google/registry/tools/UpdatePremiumListCommand.java +++ b/java/google/registry/tools/UpdatePremiumListCommand.java @@ -15,7 +15,6 @@ package google.registry.tools; import com.beust.jcommander.Parameters; - import google.registry.model.registry.label.PremiumList; import google.registry.tools.server.UpdatePremiumListAction; diff --git a/java/google/registry/tools/UpdateRegistrarCommand.java b/java/google/registry/tools/UpdateRegistrarCommand.java index 01a6af94d..e31b9ccbe 100644 --- a/java/google/registry/tools/UpdateRegistrarCommand.java +++ b/java/google/registry/tools/UpdateRegistrarCommand.java @@ -17,7 +17,6 @@ package google.registry.tools; import static com.google.common.base.Preconditions.checkNotNull; import com.beust.jcommander.Parameters; - import google.registry.model.registrar.Registrar; import google.registry.tools.Command.GtechCommand; diff --git a/java/google/registry/tools/UpdateReservedListCommand.java b/java/google/registry/tools/UpdateReservedListCommand.java index 7fb312ec1..16714a0ae 100644 --- a/java/google/registry/tools/UpdateReservedListCommand.java +++ b/java/google/registry/tools/UpdateReservedListCommand.java @@ -18,15 +18,12 @@ import static com.google.common.base.Preconditions.checkArgument; import static google.registry.util.ListNamingUtils.convertFilePathToName; import static java.nio.charset.StandardCharsets.UTF_8; +import com.beust.jcommander.Parameters; import com.google.common.base.Optional; import com.google.common.base.Strings; - -import com.beust.jcommander.Parameters; - import google.registry.model.registry.label.ReservedList; import google.registry.model.registry.label.ReservedList.Builder; import google.registry.util.SystemClock; - import java.nio.file.Files; /** Command to safely update {@link ReservedList} on Datastore. */ diff --git a/java/google/registry/tools/UpdateSandboxTldCommand.java b/java/google/registry/tools/UpdateSandboxTldCommand.java index 6de3c15fa..e6f83f809 100644 --- a/java/google/registry/tools/UpdateSandboxTldCommand.java +++ b/java/google/registry/tools/UpdateSandboxTldCommand.java @@ -17,7 +17,6 @@ package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import com.beust.jcommander.Parameters; - import google.registry.config.RegistryEnvironment; import google.registry.tools.Command.GtechCommand; diff --git a/java/google/registry/tools/UpdateServerLocksCommand.java b/java/google/registry/tools/UpdateServerLocksCommand.java index 219fc5ffa..b15120517 100644 --- a/java/google/registry/tools/UpdateServerLocksCommand.java +++ b/java/google/registry/tools/UpdateServerLocksCommand.java @@ -20,16 +20,13 @@ import static com.google.common.collect.Sets.difference; import static com.google.common.collect.Sets.intersection; import static com.google.common.collect.Sets.union; -import com.google.common.collect.ImmutableSet; -import com.google.template.soy.data.SoyMapData; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.collect.ImmutableSet; +import com.google.template.soy.data.SoyMapData; import google.registry.model.eppcommon.StatusValue; import google.registry.tools.Command.GtechCommand; import google.registry.tools.soy.UpdateServerLocksSoyInfo; - import java.util.ArrayList; import java.util.List; import java.util.Set; diff --git a/java/google/registry/tools/UpdateSmdCommand.java b/java/google/registry/tools/UpdateSmdCommand.java index 195030d1b..b05649815 100644 --- a/java/google/registry/tools/UpdateSmdCommand.java +++ b/java/google/registry/tools/UpdateSmdCommand.java @@ -21,24 +21,20 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.tmch.TmchData.readEncodedSignedMark; import static java.nio.charset.StandardCharsets.US_ASCII; -import com.google.common.collect.ImmutableList; -import com.google.common.net.InternetDomainName; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import com.google.common.collect.ImmutableList; +import com.google.common.net.InternetDomainName; import com.googlecode.objectify.VoidWork; - import google.registry.flows.EppException; import google.registry.model.domain.DomainApplication; import google.registry.model.reporting.HistoryEntry; import google.registry.model.smd.EncodedSignedMark; import google.registry.tools.Command.RemoteApiCommand; import google.registry.tools.params.PathParameter; - -import org.joda.time.DateTime; - import java.nio.file.Files; import java.nio.file.Path; +import org.joda.time.DateTime; /** Command to update the SMD on a domain application. */ @Parameters(separators = " =", commandDescription = "Update the SMD on an application.") diff --git a/java/google/registry/tools/UpdateTldCommand.java b/java/google/registry/tools/UpdateTldCommand.java index 64e21ff60..7779cf223 100644 --- a/java/google/registry/tools/UpdateTldCommand.java +++ b/java/google/registry/tools/UpdateTldCommand.java @@ -21,20 +21,16 @@ import static com.google.common.collect.Sets.union; import static google.registry.model.registry.Registries.assertTldExists; import static google.registry.util.CollectionUtils.nullToEmpty; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; import com.googlecode.objectify.Key; - import google.registry.model.registry.Registry; import google.registry.model.registry.label.ReservedList; - import java.util.List; import java.util.Set; - import javax.annotation.Nullable; /** Command to update a TLD. */ diff --git a/java/google/registry/tools/UploadClaimsListCommand.java b/java/google/registry/tools/UploadClaimsListCommand.java index 7cbaadeed..5490d53d1 100644 --- a/java/google/registry/tools/UploadClaimsListCommand.java +++ b/java/google/registry/tools/UploadClaimsListCommand.java @@ -17,16 +17,13 @@ package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static java.nio.charset.StandardCharsets.US_ASCII; -import com.google.common.base.Joiner; -import com.google.common.io.Files; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.base.Joiner; +import com.google.common.io.Files; import google.registry.model.tmch.ClaimsListShard; import google.registry.tmch.ClaimsListParser; import google.registry.tools.Command.RemoteApiCommand; - import java.io.File; import java.io.IOException; import java.util.ArrayList; diff --git a/java/google/registry/tools/ValidateEscrowDepositCommand.java b/java/google/registry/tools/ValidateEscrowDepositCommand.java index 86fc3b4aa..b1d681bce 100644 --- a/java/google/registry/tools/ValidateEscrowDepositCommand.java +++ b/java/google/registry/tools/ValidateEscrowDepositCommand.java @@ -19,12 +19,10 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.ImmutableList.copyOf; import static com.google.common.collect.Sets.difference; -import com.google.common.base.Joiner; -import com.google.common.collect.Ordering; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.base.Joiner; +import com.google.common.collect.Ordering; import google.registry.keyring.api.Keyring; import google.registry.rde.Ghostryde; import google.registry.tools.params.PathParameter; @@ -37,7 +35,6 @@ import google.registry.xjc.rdedomain.XjcRdeDomain; import google.registry.xjc.rdehost.XjcRdeHost; import google.registry.xjc.rderegistrar.XjcRdeRegistrar; import google.registry.xml.XmlException; - import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; @@ -49,7 +46,6 @@ import java.util.Map; import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; - import javax.annotation.Nullable; import javax.inject.Inject; import javax.xml.bind.JAXBElement; diff --git a/java/google/registry/tools/ValidateLoginCredentialsCommand.java b/java/google/registry/tools/ValidateLoginCredentialsCommand.java index b03f68af1..4092869ee 100644 --- a/java/google/registry/tools/ValidateLoginCredentialsCommand.java +++ b/java/google/registry/tools/ValidateLoginCredentialsCommand.java @@ -21,20 +21,16 @@ import static google.registry.util.X509Utils.getCertificateHash; import static google.registry.util.X509Utils.loadCertificate; import static java.nio.charset.StandardCharsets.US_ASCII; -import com.google.common.base.Optional; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.base.Optional; import google.registry.flows.TlsCredentials; import google.registry.model.registrar.Registrar; import google.registry.tools.Command.GtechCommand; import google.registry.tools.Command.RemoteApiCommand; import google.registry.tools.params.PathParameter; - import java.nio.file.Files; import java.nio.file.Path; - import javax.annotation.Nullable; /** A command to test registrar login credentials. */ diff --git a/java/google/registry/tools/VerifyOteCommand.java b/java/google/registry/tools/VerifyOteCommand.java index bb10946bb..1b99e50af 100644 --- a/java/google/registry/tools/VerifyOteCommand.java +++ b/java/google/registry/tools/VerifyOteCommand.java @@ -19,19 +19,16 @@ import static com.google.common.base.Predicates.notNull; import static com.google.common.base.Verify.verifyNotNull; import static google.registry.model.registrar.Registrar.loadByClientId; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; import com.google.common.base.Function; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; - import google.registry.config.RegistryEnvironment; import google.registry.model.registrar.Registrar; import google.registry.tools.Command.GtechCommand; import google.registry.tools.server.VerifyOteAction; - import java.io.IOException; import java.util.ArrayList; import java.util.Collection; diff --git a/java/google/registry/tools/WhoisQueryCommand.java b/java/google/registry/tools/WhoisQueryCommand.java index 919556d27..bfc2fac86 100644 --- a/java/google/registry/tools/WhoisQueryCommand.java +++ b/java/google/registry/tools/WhoisQueryCommand.java @@ -14,19 +14,15 @@ package google.registry.tools; -import com.google.common.base.Joiner; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.base.Joiner; import google.registry.tools.Command.GtechCommand; import google.registry.tools.Command.RemoteApiCommand; import google.registry.whois.Whois; import google.registry.whois.WhoisException; import google.registry.whois.WhoisResponse; - import java.util.List; - import javax.inject.Inject; /** Command to execute a WHOIS query. */ diff --git a/java/google/registry/tools/javascrap/LoadAndResaveCommand.java b/java/google/registry/tools/javascrap/LoadAndResaveCommand.java index 33c496910..368f5d14f 100644 --- a/java/google/registry/tools/javascrap/LoadAndResaveCommand.java +++ b/java/google/registry/tools/javascrap/LoadAndResaveCommand.java @@ -19,22 +19,18 @@ import static google.registry.model.EppResourceUtils.loadByUniqueId; import static google.registry.model.ofy.ObjectifyService.ofy; import static org.joda.time.DateTimeZone.UTC; -import com.google.common.base.Function; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.common.base.Function; import google.registry.model.EppResource; import google.registry.model.contact.ContactResource; import google.registry.model.domain.DomainApplication; import google.registry.model.domain.DomainResource; import google.registry.model.host.HostResource; import google.registry.tools.MutatingCommand; - -import org.joda.time.DateTime; - import java.util.Arrays; import java.util.Map; +import org.joda.time.DateTime; /** Load and resave an object in the probers, to trigger @OnSave changes. */ @Parameters( diff --git a/java/google/registry/tools/javascrap/RemoveIpAddressCommand.java b/java/google/registry/tools/javascrap/RemoveIpAddressCommand.java index 144d811a1..d9bfa34b7 100644 --- a/java/google/registry/tools/javascrap/RemoveIpAddressCommand.java +++ b/java/google/registry/tools/javascrap/RemoveIpAddressCommand.java @@ -17,16 +17,13 @@ package google.registry.tools.javascrap; import static google.registry.model.ofy.ObjectifyService.ofy; import static java.nio.charset.StandardCharsets.UTF_8; -import com.google.template.soy.data.SoyMapData; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - +import com.google.template.soy.data.SoyMapData; import google.registry.model.host.HostResource; import google.registry.tools.MutatingEppToolCommand; import google.registry.tools.params.PathParameter; import google.registry.tools.soy.RemoveIpAddressSoyInfo; - import java.net.Inet6Address; import java.net.InetAddress; import java.nio.file.Files; diff --git a/java/google/registry/tools/params/DateTimeParameter.java b/java/google/registry/tools/params/DateTimeParameter.java index d1af3f7fb..75b0aab7c 100644 --- a/java/google/registry/tools/params/DateTimeParameter.java +++ b/java/google/registry/tools/params/DateTimeParameter.java @@ -17,7 +17,6 @@ package google.registry.tools.params; import static org.joda.time.DateTimeZone.UTC; import com.google.common.primitives.Longs; - import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.DateTimeFormatterBuilder; diff --git a/java/google/registry/tools/params/MoneyParameter.java b/java/google/registry/tools/params/MoneyParameter.java index 77b4eacef..bbffd24f2 100644 --- a/java/google/registry/tools/params/MoneyParameter.java +++ b/java/google/registry/tools/params/MoneyParameter.java @@ -15,7 +15,6 @@ package google.registry.tools.params; import com.google.common.base.Ascii; - import org.joda.money.Money; /** {@linkplain Money} CLI parameter converter/validator. */ diff --git a/java/google/registry/tools/params/OptionalParameterConverterValidator.java b/java/google/registry/tools/params/OptionalParameterConverterValidator.java index fbe4057ce..3644c6019 100644 --- a/java/google/registry/tools/params/OptionalParameterConverterValidator.java +++ b/java/google/registry/tools/params/OptionalParameterConverterValidator.java @@ -15,7 +15,6 @@ package google.registry.tools.params; import com.google.common.base.Optional; - import google.registry.util.TypeUtils.TypeInstantiator; /** diff --git a/java/google/registry/tools/params/ParameterFactory.java b/java/google/registry/tools/params/ParameterFactory.java index 020ce64db..9711318ff 100644 --- a/java/google/registry/tools/params/ParameterFactory.java +++ b/java/google/registry/tools/params/ParameterFactory.java @@ -14,25 +14,21 @@ package google.registry.tools.params; +import com.beust.jcommander.IStringConverter; +import com.beust.jcommander.IStringConverterFactory; import com.google.common.collect.ImmutableMap; import com.google.common.net.HostAndPort; import com.google.common.net.InternetDomainName; - -import com.beust.jcommander.IStringConverter; -import com.beust.jcommander.IStringConverterFactory; - +import java.nio.file.Path; +import java.util.Map; +import java.util.logging.Level; +import javax.annotation.Nullable; import org.joda.money.Money; import org.joda.time.DateTime; import org.joda.time.Duration; import org.joda.time.LocalDate; import org.joda.time.YearMonth; -import java.nio.file.Path; -import java.util.Map; -import java.util.logging.Level; - -import javax.annotation.Nullable; - /** JCommander converter factory that works for non-internal converters. */ public final class ParameterFactory implements IStringConverterFactory { diff --git a/java/google/registry/tools/params/PathParameter.java b/java/google/registry/tools/params/PathParameter.java index 8911ecad7..7c291fb9d 100644 --- a/java/google/registry/tools/params/PathParameter.java +++ b/java/google/registry/tools/params/PathParameter.java @@ -17,10 +17,8 @@ package google.registry.tools.params; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import com.google.re2j.Pattern; - import com.beust.jcommander.ParameterException; - +import com.google.re2j.Pattern; import java.net.URI; import java.nio.file.Files; import java.nio.file.Path; diff --git a/java/google/registry/tools/params/TransitionListParameter.java b/java/google/registry/tools/params/TransitionListParameter.java index 6e1f3b4c3..390d68216 100644 --- a/java/google/registry/tools/params/TransitionListParameter.java +++ b/java/google/registry/tools/params/TransitionListParameter.java @@ -20,14 +20,11 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Ordering; - import google.registry.model.registry.Registry.TldState; - +import java.util.Map; import org.joda.money.Money; import org.joda.time.DateTime; -import java.util.Map; - /** * Combined converter and validator class for transition list JCommander argument strings. * diff --git a/java/google/registry/tools/server/CreateGroupsAction.java b/java/google/registry/tools/server/CreateGroupsAction.java index aeb185cea..fdd3f7f79 100644 --- a/java/google/registry/tools/server/CreateGroupsAction.java +++ b/java/google/registry/tools/server/CreateGroupsAction.java @@ -21,7 +21,6 @@ import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.base.Function; import com.google.common.base.Optional; - import google.registry.config.ConfigModule.Config; import google.registry.groups.GroupsConnection; import google.registry.groups.GroupsConnection.Role; @@ -35,11 +34,9 @@ import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.util.Concurrent; import google.registry.util.FormattingLogger; - import java.io.PrintWriter; import java.io.StringWriter; import java.util.List; - import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/java/google/registry/tools/server/CreateOrUpdatePremiumListAction.java b/java/google/registry/tools/server/CreateOrUpdatePremiumListAction.java index 093c8932f..071c17c7d 100644 --- a/java/google/registry/tools/server/CreateOrUpdatePremiumListAction.java +++ b/java/google/registry/tools/server/CreateOrUpdatePremiumListAction.java @@ -15,11 +15,9 @@ package google.registry.tools.server; import com.google.common.collect.ImmutableMap; - import google.registry.request.JsonResponse; import google.registry.request.Parameter; import google.registry.util.FormattingLogger; - import javax.inject.Inject; /** diff --git a/java/google/registry/tools/server/CreatePremiumListAction.java b/java/google/registry/tools/server/CreatePremiumListAction.java index a49b1e102..181da0805 100644 --- a/java/google/registry/tools/server/CreatePremiumListAction.java +++ b/java/google/registry/tools/server/CreatePremiumListAction.java @@ -20,13 +20,10 @@ import static google.registry.request.Action.Method.POST; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; - import google.registry.model.registry.label.PremiumList; import google.registry.request.Action; import google.registry.request.Parameter; - import java.util.List; - import javax.inject.Inject; /** diff --git a/java/google/registry/tools/server/DeleteEntityAction.java b/java/google/registry/tools/server/DeleteEntityAction.java index de547fde4..a921fed2d 100644 --- a/java/google/registry/tools/server/DeleteEntityAction.java +++ b/java/google/registry/tools/server/DeleteEntityAction.java @@ -25,16 +25,13 @@ import com.google.appengine.api.datastore.KeyFactory; import com.google.common.base.Optional; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; - import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.impl.EntityMetadata; - import google.registry.request.Action; import google.registry.request.HttpException.BadRequestException; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.util.FormattingLogger; - import javax.inject.Inject; /** diff --git a/java/google/registry/tools/server/DeleteProberDataAction.java b/java/google/registry/tools/server/DeleteProberDataAction.java index 38a257f0e..e5c1bff0b 100644 --- a/java/google/registry/tools/server/DeleteProberDataAction.java +++ b/java/google/registry/tools/server/DeleteProberDataAction.java @@ -27,10 +27,8 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Work; - import google.registry.mapreduce.MapreduceRunner; import google.registry.mapreduce.inputs.EppResourceInputs; import google.registry.model.domain.DomainApplication; @@ -45,9 +43,7 @@ import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.util.FormattingLogger; import google.registry.util.PipelineUtils; - import java.util.List; - import javax.inject.Inject; /** diff --git a/java/google/registry/tools/server/GenerateZoneFilesAction.java b/java/google/registry/tools/server/GenerateZoneFilesAction.java index da4996cb6..6db987d76 100644 --- a/java/google/registry/tools/server/GenerateZoneFilesAction.java +++ b/java/google/registry/tools/server/GenerateZoneFilesAction.java @@ -36,7 +36,6 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import google.registry.config.ConfigModule.Config; import google.registry.gcs.GcsUtils; import google.registry.mapreduce.MapreduceRunner; @@ -49,10 +48,6 @@ import google.registry.request.Action; import google.registry.request.HttpException.BadRequestException; import google.registry.request.JsonActionRunner; import google.registry.util.Clock; - -import org.joda.time.DateTime; -import org.joda.time.Duration; - import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; @@ -63,8 +58,9 @@ import java.net.InetAddress; import java.util.Iterator; import java.util.List; import java.util.Map; - import javax.inject.Inject; +import org.joda.time.DateTime; +import org.joda.time.Duration; /** * MapReduce that requests generation of BIND zone files for a set of TLDs at a given time. diff --git a/java/google/registry/tools/server/KillAllCommitLogsAction.java b/java/google/registry/tools/server/KillAllCommitLogsAction.java index c71af4359..d307d515b 100644 --- a/java/google/registry/tools/server/KillAllCommitLogsAction.java +++ b/java/google/registry/tools/server/KillAllCommitLogsAction.java @@ -25,18 +25,14 @@ import com.google.appengine.tools.mapreduce.inputs.InMemoryInput; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; - import com.googlecode.objectify.Key; - import google.registry.config.RegistryEnvironment; import google.registry.mapreduce.MapreduceRunner; import google.registry.model.ofy.CommitLogBucket; import google.registry.model.ofy.CommitLogCheckpointRoot; import google.registry.request.Action; import google.registry.request.Response; - import java.util.Arrays; - import javax.inject.Inject; /** Deletes all commit logs in datastore. */ diff --git a/java/google/registry/tools/server/KillAllEntitiesReducer.java b/java/google/registry/tools/server/KillAllEntitiesReducer.java index 056d1018d..6346a9feb 100644 --- a/java/google/registry/tools/server/KillAllEntitiesReducer.java +++ b/java/google/registry/tools/server/KillAllEntitiesReducer.java @@ -19,10 +19,8 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.appengine.tools.mapreduce.Reducer; import com.google.appengine.tools.mapreduce.ReducerInput; - import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; - import java.util.Iterator; import java.util.List; diff --git a/java/google/registry/tools/server/KillAllEppResourcesAction.java b/java/google/registry/tools/server/KillAllEppResourcesAction.java index 960498806..344eee6b2 100644 --- a/java/google/registry/tools/server/KillAllEppResourcesAction.java +++ b/java/google/registry/tools/server/KillAllEppResourcesAction.java @@ -21,10 +21,8 @@ import static google.registry.util.PipelineUtils.createJobPath; import com.google.appengine.tools.mapreduce.Mapper; import com.google.common.collect.ImmutableList; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Work; - import google.registry.config.RegistryEnvironment; import google.registry.mapreduce.MapreduceRunner; import google.registry.mapreduce.inputs.EppResourceInputs; @@ -35,7 +33,6 @@ import google.registry.model.index.EppResourceIndex; import google.registry.model.index.ForeignKeyIndex; import google.registry.request.Action; import google.registry.request.Response; - import javax.inject.Inject; /** Deletes all {@link EppResource} objects in datastore, including indices and descendants. */ diff --git a/java/google/registry/tools/server/ListDomainsAction.java b/java/google/registry/tools/server/ListDomainsAction.java index c58cf9e52..1b9679a12 100644 --- a/java/google/registry/tools/server/ListDomainsAction.java +++ b/java/google/registry/tools/server/ListDomainsAction.java @@ -21,14 +21,11 @@ import static google.registry.request.Action.Method.POST; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; - import google.registry.model.domain.DomainResource; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.util.Clock; - import java.util.Comparator; - import javax.inject.Inject; /** An action that lists domains, for use by the registry_tool list_domains command. */ diff --git a/java/google/registry/tools/server/ListHostsAction.java b/java/google/registry/tools/server/ListHostsAction.java index 10f02ade9..de453f4ab 100644 --- a/java/google/registry/tools/server/ListHostsAction.java +++ b/java/google/registry/tools/server/ListHostsAction.java @@ -21,17 +21,13 @@ import static google.registry.request.Action.Method.POST; import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; - import google.registry.model.EppResourceUtils; import google.registry.model.host.HostResource; import google.registry.request.Action; import google.registry.util.Clock; - -import org.joda.time.DateTime; - import java.util.Comparator; - import javax.inject.Inject; +import org.joda.time.DateTime; /** An action that lists hosts, for use by the registry_tool list_hosts command. */ @Action(path = ListHostsAction.PATH, method = {GET, POST}) diff --git a/java/google/registry/tools/server/ListObjectsAction.java b/java/google/registry/tools/server/ListObjectsAction.java index 7626433e6..b0beb5ce2 100644 --- a/java/google/registry/tools/server/ListObjectsAction.java +++ b/java/google/registry/tools/server/ListObjectsAction.java @@ -31,18 +31,15 @@ import com.google.common.collect.ImmutableTable; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; - import google.registry.model.ImmutableObject; import google.registry.request.JsonResponse; import google.registry.request.Parameter; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; - import javax.inject.Inject; /** diff --git a/java/google/registry/tools/server/ListPremiumListsAction.java b/java/google/registry/tools/server/ListPremiumListsAction.java index 53be20a0e..6509ecb7d 100644 --- a/java/google/registry/tools/server/ListPremiumListsAction.java +++ b/java/google/registry/tools/server/ListPremiumListsAction.java @@ -20,10 +20,8 @@ import static google.registry.request.Action.Method.GET; import static google.registry.request.Action.Method.POST; import com.google.common.collect.ImmutableSet; - import google.registry.model.registry.label.PremiumList; import google.registry.request.Action; - import javax.inject.Inject; /** An action that lists premium lists, for use by the registry_tool list_premium_lists command. */ diff --git a/java/google/registry/tools/server/ListRegistrarsAction.java b/java/google/registry/tools/server/ListRegistrarsAction.java index 2514b7934..b5f9dac95 100644 --- a/java/google/registry/tools/server/ListRegistrarsAction.java +++ b/java/google/registry/tools/server/ListRegistrarsAction.java @@ -20,10 +20,8 @@ import static google.registry.request.Action.Method.POST; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import google.registry.model.registrar.Registrar; import google.registry.request.Action; - import javax.inject.Inject; /** An action that lists registrars, for use by the registry_tool list_registrars command. */ diff --git a/java/google/registry/tools/server/ListReservedListsAction.java b/java/google/registry/tools/server/ListReservedListsAction.java index 2079d5e4e..6c4829b2c 100644 --- a/java/google/registry/tools/server/ListReservedListsAction.java +++ b/java/google/registry/tools/server/ListReservedListsAction.java @@ -20,10 +20,8 @@ import static google.registry.request.Action.Method.GET; import static google.registry.request.Action.Method.POST; import com.google.common.collect.ImmutableSet; - import google.registry.model.registry.label.ReservedList; import google.registry.request.Action; - import javax.inject.Inject; /** A that lists reserved lists, for use by the registry_tool list_reserved_lists command. */ diff --git a/java/google/registry/tools/server/ListTldsAction.java b/java/google/registry/tools/server/ListTldsAction.java index a8976ded3..a8c4f74c0 100644 --- a/java/google/registry/tools/server/ListTldsAction.java +++ b/java/google/registry/tools/server/ListTldsAction.java @@ -23,14 +23,11 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import google.registry.model.registry.Registry; import google.registry.request.Action; import google.registry.util.Clock; - -import org.joda.time.DateTime; - import javax.inject.Inject; +import org.joda.time.DateTime; /** An action that lists top-level domains, for use by the registry_tool list_tlds command. */ @Action(path = ListTldsAction.PATH, method = {GET, POST}) diff --git a/java/google/registry/tools/server/ResaveAllEppResourcesAction.java b/java/google/registry/tools/server/ResaveAllEppResourcesAction.java index 8ac28532b..4b23ffa9f 100644 --- a/java/google/registry/tools/server/ResaveAllEppResourcesAction.java +++ b/java/google/registry/tools/server/ResaveAllEppResourcesAction.java @@ -20,14 +20,11 @@ import static google.registry.util.PipelineUtils.createJobPath; import com.google.appengine.tools.mapreduce.Mapper; import com.google.common.collect.ImmutableList; - import com.googlecode.objectify.VoidWork; - import google.registry.mapreduce.MapreduceRunner; import google.registry.model.EppResource; import google.registry.request.Action; import google.registry.request.Response; - import javax.inject.Inject; /** diff --git a/java/google/registry/tools/server/ToolsServerModule.java b/java/google/registry/tools/server/ToolsServerModule.java index b29cba256..5e0238b8e 100644 --- a/java/google/registry/tools/server/ToolsServerModule.java +++ b/java/google/registry/tools/server/ToolsServerModule.java @@ -20,12 +20,9 @@ import static google.registry.request.RequestParameters.extractOptionalParameter import static google.registry.request.RequestParameters.extractRequiredParameter; import com.google.common.base.Optional; - import dagger.Module; import dagger.Provides; - import google.registry.request.Parameter; - import javax.servlet.http.HttpServletRequest; /** diff --git a/java/google/registry/tools/server/UpdatePremiumListAction.java b/java/google/registry/tools/server/UpdatePremiumListAction.java index e45cfac95..0b57d8814 100644 --- a/java/google/registry/tools/server/UpdatePremiumListAction.java +++ b/java/google/registry/tools/server/UpdatePremiumListAction.java @@ -20,12 +20,9 @@ import static google.registry.request.Action.Method.POST; import com.google.common.base.Optional; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; - import google.registry.model.registry.label.PremiumList; import google.registry.request.Action; - import java.util.List; - import javax.inject.Inject; /** diff --git a/java/google/registry/tools/server/VerifyOteAction.java b/java/google/registry/tools/server/VerifyOteAction.java index 60f69fb43..5c8b63ad4 100644 --- a/java/google/registry/tools/server/VerifyOteAction.java +++ b/java/google/registry/tools/server/VerifyOteAction.java @@ -31,7 +31,6 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.HashMultiset; import com.google.common.collect.ImmutableList; import com.google.common.collect.Multiset; - import google.registry.flows.EppException; import google.registry.flows.Flow; import google.registry.flows.contact.ContactCreateFlow; @@ -68,12 +67,10 @@ import google.registry.model.reporting.HistoryEntry; import google.registry.request.Action; import google.registry.request.JsonActionRunner; import google.registry.request.JsonActionRunner.JsonAction; - import java.util.ArrayList; import java.util.EnumSet; import java.util.List; import java.util.Map; - import javax.annotation.Nonnull; import javax.inject.Inject; diff --git a/java/google/registry/tools/server/javascrap/BackfillAutorenewBillingFlagAction.java b/java/google/registry/tools/server/javascrap/BackfillAutorenewBillingFlagAction.java index d9a58db71..d0a376c67 100644 --- a/java/google/registry/tools/server/javascrap/BackfillAutorenewBillingFlagAction.java +++ b/java/google/registry/tools/server/javascrap/BackfillAutorenewBillingFlagAction.java @@ -23,9 +23,7 @@ import com.google.appengine.tools.mapreduce.Input; import com.google.appengine.tools.mapreduce.Mapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.VoidWork; - import google.registry.mapreduce.MapreduceRunner; import google.registry.model.billing.BillingEvent.Flag; import google.registry.model.billing.BillingEvent.Recurring; @@ -34,7 +32,6 @@ import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.util.FormattingLogger; - import javax.inject.Inject; /** A mapreduce that backfills new {@link Flag#AUTO_RENEW} flag on recurring billing events. */ diff --git a/java/google/registry/tools/server/javascrap/CountRecurringBillingEventsAction.java b/java/google/registry/tools/server/javascrap/CountRecurringBillingEventsAction.java index 055cc422c..02d46bd74 100644 --- a/java/google/registry/tools/server/javascrap/CountRecurringBillingEventsAction.java +++ b/java/google/registry/tools/server/javascrap/CountRecurringBillingEventsAction.java @@ -21,13 +21,11 @@ import com.google.appengine.tools.mapreduce.Input; import com.google.appengine.tools.mapreduce.Mapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import google.registry.mapreduce.MapreduceRunner; import google.registry.model.EppResource; import google.registry.model.billing.BillingEvent.Recurring; import google.registry.request.Action; import google.registry.request.Response; - import javax.inject.Inject; /** diff --git a/java/google/registry/ui/ConsoleConfigModule.java b/java/google/registry/ui/ConsoleConfigModule.java index 8a7e12af7..7f561e089 100644 --- a/java/google/registry/ui/ConsoleConfigModule.java +++ b/java/google/registry/ui/ConsoleConfigModule.java @@ -15,10 +15,8 @@ package google.registry.ui; import com.google.appengine.api.users.UserService; - import dagger.Module; import dagger.Provides; - import google.registry.config.ConfigModule.Config; /** Dagger module for UI configuration. */ diff --git a/java/google/registry/ui/forms/FormField.java b/java/google/registry/ui/forms/FormField.java index 8359011db..0dc499b04 100644 --- a/java/google/registry/ui/forms/FormField.java +++ b/java/google/registry/ui/forms/FormField.java @@ -28,12 +28,10 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Range; import com.google.re2j.Pattern; - import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; - import javax.annotation.Detainted; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/java/google/registry/ui/forms/FormFieldException.java b/java/google/registry/ui/forms/FormFieldException.java index a0c226709..f0cd6bc5d 100644 --- a/java/google/registry/ui/forms/FormFieldException.java +++ b/java/google/registry/ui/forms/FormFieldException.java @@ -20,12 +20,10 @@ import static com.google.common.base.Preconditions.checkState; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Objects; - import javax.annotation.CheckReturnValue; import javax.annotation.Detainted; import javax.annotation.Nullable; diff --git a/java/google/registry/ui/forms/FormFields.java b/java/google/registry/ui/forms/FormFields.java index fba54a162..29508f538 100644 --- a/java/google/registry/ui/forms/FormFields.java +++ b/java/google/registry/ui/forms/FormFields.java @@ -22,7 +22,6 @@ import static java.util.Locale.getISOCountries; import com.google.common.base.Function; import com.google.common.collect.ImmutableSet; import com.google.re2j.Pattern; - import javax.annotation.Nullable; /** Utility class of {@link FormField} objects for validating EPP related things. */ diff --git a/java/google/registry/ui/server/RegistrarFormFields.java b/java/google/registry/ui/server/RegistrarFormFields.java index e8aa78e03..b7f9f3761 100644 --- a/java/google/registry/ui/server/RegistrarFormFields.java +++ b/java/google/registry/ui/server/RegistrarFormFields.java @@ -24,7 +24,6 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.net.InternetDomainName; import com.google.re2j.Pattern; - import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarAddress; import google.registry.model.registrar.RegistrarContact; @@ -33,12 +32,10 @@ import google.registry.ui.forms.FormFieldException; import google.registry.ui.forms.FormFields; import google.registry.util.CidrAddressBlock; import google.registry.util.X509Utils; - import java.security.cert.CertificateParsingException; import java.util.List; import java.util.Map; import java.util.Set; - import javax.annotation.Nullable; /** Form fields for validating input for the {@code Registrar} class. */ diff --git a/java/google/registry/ui/server/SoyTemplateUtils.java b/java/google/registry/ui/server/SoyTemplateUtils.java index 9d103464a..ae823d812 100644 --- a/java/google/registry/ui/server/SoyTemplateUtils.java +++ b/java/google/registry/ui/server/SoyTemplateUtils.java @@ -33,9 +33,7 @@ import com.google.template.soy.base.SoySyntaxException; import com.google.template.soy.parseinfo.SoyFileInfo; import com.google.template.soy.shared.SoyCssRenamingMap; import com.google.template.soy.tofu.SoyTofu; - import google.registry.ui.ConsoleDebug; - import java.io.IOException; import java.net.URL; import java.util.ArrayList; diff --git a/java/google/registry/ui/server/registrar/ConsoleUiAction.java b/java/google/registry/ui/server/registrar/ConsoleUiAction.java index 018492b14..e2c31b65c 100644 --- a/java/google/registry/ui/server/registrar/ConsoleUiAction.java +++ b/java/google/registry/ui/server/registrar/ConsoleUiAction.java @@ -26,7 +26,6 @@ import com.google.common.net.MediaType; import com.google.template.soy.data.SoyMapData; import com.google.template.soy.shared.SoyCssRenamingMap; import com.google.template.soy.tofu.SoyTofu; - import google.registry.config.ConfigModule.Config; import google.registry.flows.EppConsoleAction; import google.registry.model.registrar.Registrar; @@ -35,7 +34,6 @@ import google.registry.request.Response; import google.registry.security.XsrfTokenManager; import google.registry.ui.server.SoyTemplateUtils; import google.registry.ui.soy.registrar.ConsoleSoyInfo; - import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; diff --git a/java/google/registry/ui/server/registrar/RegistrarPaymentAction.java b/java/google/registry/ui/server/registrar/RegistrarPaymentAction.java index 73d8bd52d..4825d27d2 100644 --- a/java/google/registry/ui/server/registrar/RegistrarPaymentAction.java +++ b/java/google/registry/ui/server/registrar/RegistrarPaymentAction.java @@ -21,17 +21,15 @@ import static google.registry.security.JsonResponseHelper.Status.ERROR; import static google.registry.security.JsonResponseHelper.Status.SUCCESS; import static java.util.Arrays.asList; -import com.google.common.base.Function; -import com.google.common.collect.ImmutableMap; -import com.google.re2j.Pattern; - import com.braintreegateway.BraintreeGateway; import com.braintreegateway.Result; import com.braintreegateway.Transaction; import com.braintreegateway.TransactionRequest; import com.braintreegateway.ValidationError; import com.braintreegateway.ValidationErrors; - +import com.google.common.base.Function; +import com.google.common.collect.ImmutableMap; +import com.google.re2j.Pattern; import google.registry.config.ConfigModule.Config; import google.registry.model.registrar.Registrar; import google.registry.request.Action; @@ -41,17 +39,14 @@ import google.registry.security.JsonResponseHelper; import google.registry.ui.forms.FormField; import google.registry.ui.forms.FormFieldException; import google.registry.util.FormattingLogger; - -import org.joda.money.CurrencyUnit; -import org.joda.money.IllegalCurrencyException; -import org.joda.money.Money; - import java.math.BigDecimal; import java.util.List; import java.util.Locale; import java.util.Map; - import javax.inject.Inject; +import org.joda.money.CurrencyUnit; +import org.joda.money.IllegalCurrencyException; +import org.joda.money.Money; /** * Action handling submission of customer payment form. diff --git a/java/google/registry/ui/server/registrar/RegistrarPaymentSetupAction.java b/java/google/registry/ui/server/registrar/RegistrarPaymentSetupAction.java index 9d38feb1d..68401df8f 100644 --- a/java/google/registry/ui/server/registrar/RegistrarPaymentSetupAction.java +++ b/java/google/registry/ui/server/registrar/RegistrarPaymentSetupAction.java @@ -19,11 +19,9 @@ import static google.registry.security.JsonResponseHelper.Status.ERROR; import static google.registry.security.JsonResponseHelper.Status.SUCCESS; import static java.util.Arrays.asList; +import com.braintreegateway.BraintreeGateway; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMap; - -import com.braintreegateway.BraintreeGateway; - import google.registry.braintree.BraintreeRegistrarSyncer; import google.registry.config.ConfigModule.Config; import google.registry.model.registrar.Registrar; @@ -31,12 +29,9 @@ import google.registry.request.Action; import google.registry.request.JsonActionRunner; import google.registry.request.JsonActionRunner.JsonAction; import google.registry.security.JsonResponseHelper; - -import org.joda.money.CurrencyUnit; - import java.util.Map; - import javax.inject.Inject; +import org.joda.money.CurrencyUnit; /** * Action returning information needed to render payment form in browser. diff --git a/java/google/registry/ui/server/registrar/RegistrarServlet.java b/java/google/registry/ui/server/registrar/RegistrarServlet.java index 881cb650f..f268ad5de 100644 --- a/java/google/registry/ui/server/registrar/RegistrarServlet.java +++ b/java/google/registry/ui/server/registrar/RegistrarServlet.java @@ -27,9 +27,7 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; - import com.googlecode.objectify.Work; - import google.registry.config.RegistryConfig; import google.registry.config.RegistryEnvironment; import google.registry.export.sheet.SyncRegistrarsSheetAction; @@ -42,12 +40,10 @@ import google.registry.util.CidrAddressBlock; import google.registry.util.CollectionUtils; import google.registry.util.DiffUtils; import google.registry.util.SendEmailUtils; - import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; - import javax.servlet.http.HttpServletRequest; /** diff --git a/java/google/registry/ui/server/registrar/RegistrarUserModule.java b/java/google/registry/ui/server/registrar/RegistrarUserModule.java index 5da636f1e..5bc17e191 100644 --- a/java/google/registry/ui/server/registrar/RegistrarUserModule.java +++ b/java/google/registry/ui/server/registrar/RegistrarUserModule.java @@ -16,10 +16,8 @@ package google.registry.ui.server.registrar; import dagger.Module; import dagger.Provides; - import google.registry.model.registrar.Registrar; import google.registry.request.HttpException.ForbiddenException; - import javax.servlet.http.HttpServletRequest; /** Registrar Console module providing reference to logged-in {@link Registrar}. */ diff --git a/java/google/registry/ui/server/registrar/ResourceServlet.java b/java/google/registry/ui/server/registrar/ResourceServlet.java index 1922d398e..819a38040 100644 --- a/java/google/registry/ui/server/registrar/ResourceServlet.java +++ b/java/google/registry/ui/server/registrar/ResourceServlet.java @@ -20,16 +20,13 @@ import static google.registry.security.JsonResponseHelper.Status.ERROR; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; - import google.registry.request.HttpException.NotFoundException; import google.registry.security.JsonResponseHelper; import google.registry.security.JsonTransportServlet; import google.registry.ui.forms.FormException; import google.registry.ui.forms.FormFieldException; import google.registry.util.NonFinalForTesting; - import java.util.Map; - import javax.annotation.Nullable; import javax.servlet.http.HttpServletRequest; diff --git a/java/google/registry/ui/server/registrar/SessionUtils.java b/java/google/registry/ui/server/registrar/SessionUtils.java index 67ea8ad84..2caa951ac 100644 --- a/java/google/registry/ui/server/registrar/SessionUtils.java +++ b/java/google/registry/ui/server/registrar/SessionUtils.java @@ -26,11 +26,9 @@ import com.google.appengine.api.users.UserService; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; - import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; import google.registry.util.FormattingLogger; - import javax.annotation.CheckReturnValue; import javax.annotation.Nonnull; import javax.annotation.concurrent.Immutable; diff --git a/java/google/registry/util/AppEngineTimeLimiter.java b/java/google/registry/util/AppEngineTimeLimiter.java index a8a0e07ef..a126c5f2e 100644 --- a/java/google/registry/util/AppEngineTimeLimiter.java +++ b/java/google/registry/util/AppEngineTimeLimiter.java @@ -18,7 +18,6 @@ import static com.google.appengine.api.ThreadManager.currentRequestThreadFactory import com.google.common.util.concurrent.SimpleTimeLimiter; import com.google.common.util.concurrent.TimeLimiter; - import java.util.List; import java.util.concurrent.AbstractExecutorService; import java.util.concurrent.TimeUnit; diff --git a/java/google/registry/util/CacheUtils.java b/java/google/registry/util/CacheUtils.java index ef0742c20..913c0120e 100644 --- a/java/google/registry/util/CacheUtils.java +++ b/java/google/registry/util/CacheUtils.java @@ -19,9 +19,7 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.joda.time.Duration.ZERO; import com.google.common.base.Supplier; - import google.registry.config.RegistryEnvironment; - import org.joda.time.Duration; /** Utility methods related to caching. */ diff --git a/java/google/registry/util/CapturingLogHandler.java b/java/google/registry/util/CapturingLogHandler.java index 6c69a2853..3ae2d05ae 100644 --- a/java/google/registry/util/CapturingLogHandler.java +++ b/java/google/registry/util/CapturingLogHandler.java @@ -15,12 +15,10 @@ package google.registry.util; import com.google.common.collect.Iterables; - import java.util.ArrayList; import java.util.List; import java.util.logging.Handler; import java.util.logging.LogRecord; - import javax.annotation.Nullable; /** A log handler that captures logs. */ diff --git a/java/google/registry/util/CidrAddressBlock.java b/java/google/registry/util/CidrAddressBlock.java index 71f9e3c20..29d1827a8 100644 --- a/java/google/registry/util/CidrAddressBlock.java +++ b/java/google/registry/util/CidrAddressBlock.java @@ -18,14 +18,12 @@ import static com.google.common.base.Preconditions.checkArgument; import com.google.common.collect.AbstractSequentialIterator; import com.google.common.net.InetAddresses; - import java.io.Serializable; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Arrays; import java.util.Iterator; import java.util.logging.Logger; - import javax.annotation.Nullable; /** diff --git a/java/google/registry/util/Clock.java b/java/google/registry/util/Clock.java index 0eb3e669c..d4cce5771 100644 --- a/java/google/registry/util/Clock.java +++ b/java/google/registry/util/Clock.java @@ -14,9 +14,8 @@ package google.registry.util; -import org.joda.time.DateTime; - import javax.annotation.concurrent.ThreadSafe; +import org.joda.time.DateTime; /** A clock that tells the current time in milliseconds or nanoseconds. */ @ThreadSafe diff --git a/java/google/registry/util/CollectionUtils.java b/java/google/registry/util/CollectionUtils.java index 62006f118..a7f9847cb 100644 --- a/java/google/registry/util/CollectionUtils.java +++ b/java/google/registry/util/CollectionUtils.java @@ -28,13 +28,11 @@ import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Multimap; import com.google.common.collect.Multisets; import com.google.common.collect.Sets; - import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; import java.util.SortedMap; - import javax.annotation.Nullable; /** Utility methods related to collections. */ diff --git a/java/google/registry/util/Concurrent.java b/java/google/registry/util/Concurrent.java index ff21d333e..ab4690e11 100644 --- a/java/google/registry/util/Concurrent.java +++ b/java/google/registry/util/Concurrent.java @@ -25,7 +25,6 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.UncheckedExecutionException; import com.google.common.util.concurrent.Uninterruptibles; - import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/java/google/registry/util/DateTimeUtils.java b/java/google/registry/util/DateTimeUtils.java index 6c9392c6d..1c403755c 100644 --- a/java/google/registry/util/DateTimeUtils.java +++ b/java/google/registry/util/DateTimeUtils.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkArgument; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; - import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/java/google/registry/util/DiffUtils.java b/java/google/registry/util/DiffUtils.java index 7baf17d04..7ce313e76 100644 --- a/java/google/registry/util/DiffUtils.java +++ b/java/google/registry/util/DiffUtils.java @@ -26,11 +26,9 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Ordering; import com.google.common.collect.Sets; import com.google.common.primitives.Primitives; - import java.util.Map; import java.util.Objects; import java.util.Set; - import javax.annotation.Nullable; /** Helper class for diff utilities. */ diff --git a/java/google/registry/util/FormattingLogger.java b/java/google/registry/util/FormattingLogger.java index 8579f0fb0..aaa355038 100644 --- a/java/google/registry/util/FormattingLogger.java +++ b/java/google/registry/util/FormattingLogger.java @@ -18,7 +18,6 @@ import static java.util.Arrays.asList; import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; - import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/java/google/registry/util/HexDumper.java b/java/google/registry/util/HexDumper.java index 0e7ab828a..112c94c53 100644 --- a/java/google/registry/util/HexDumper.java +++ b/java/google/registry/util/HexDumper.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.io.OutputStream; import java.io.StringWriter; import java.io.Writer; - import javax.annotation.Nonnegative; import javax.annotation.WillNotClose; import javax.annotation.concurrent.NotThreadSafe; diff --git a/java/google/registry/util/Idn.java b/java/google/registry/util/Idn.java index d372b5b64..ffb66dd20 100644 --- a/java/google/registry/util/Idn.java +++ b/java/google/registry/util/Idn.java @@ -15,7 +15,6 @@ package google.registry.util; import com.google.common.base.Joiner; - import com.ibm.icu.text.IDNA; import com.ibm.icu.text.IDNA.Info; diff --git a/java/google/registry/util/ImprovedInputStream.java b/java/google/registry/util/ImprovedInputStream.java index 87d01838d..70cff161a 100644 --- a/java/google/registry/util/ImprovedInputStream.java +++ b/java/google/registry/util/ImprovedInputStream.java @@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; - import javax.annotation.OverridingMethodsMustInvokeSuper; import javax.annotation.WillCloseWhenClosed; import javax.annotation.concurrent.NotThreadSafe; diff --git a/java/google/registry/util/ImprovedOutputStream.java b/java/google/registry/util/ImprovedOutputStream.java index 2c86afa91..e77ceb951 100644 --- a/java/google/registry/util/ImprovedOutputStream.java +++ b/java/google/registry/util/ImprovedOutputStream.java @@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.io.FilterOutputStream; import java.io.IOException; import java.io.OutputStream; - import javax.annotation.OverridingMethodsMustInvokeSuper; import javax.annotation.WillCloseWhenClosed; import javax.annotation.concurrent.NotThreadSafe; diff --git a/java/google/registry/util/ListNamingUtils.java b/java/google/registry/util/ListNamingUtils.java index f7dc921c9..0567debf2 100644 --- a/java/google/registry/util/ListNamingUtils.java +++ b/java/google/registry/util/ListNamingUtils.java @@ -15,7 +15,6 @@ package google.registry.util; import com.google.common.io.Files; - import java.nio.file.Path; /** diff --git a/java/google/registry/util/NetworkUtils.java b/java/google/registry/util/NetworkUtils.java index 7f962d42d..ada9d32da 100644 --- a/java/google/registry/util/NetworkUtils.java +++ b/java/google/registry/util/NetworkUtils.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static google.registry.util.CollectionUtils.union; import com.google.common.collect.ImmutableSet; - import java.io.IOException; import java.net.Inet6Address; import java.net.InetAddress; @@ -32,7 +31,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Random; import java.util.Set; - import javax.annotation.concurrent.GuardedBy; /** Utilities for networking. */ diff --git a/java/google/registry/util/ObjectifyUtils.java b/java/google/registry/util/ObjectifyUtils.java index 23251d12c..583bc9aea 100644 --- a/java/google/registry/util/ObjectifyUtils.java +++ b/java/google/registry/util/ObjectifyUtils.java @@ -15,7 +15,6 @@ package google.registry.util; import com.google.common.base.Function; - import com.googlecode.objectify.Key; /** Utilities for working with Objectify. */ diff --git a/java/google/registry/util/PosixTarHeader.java b/java/google/registry/util/PosixTarHeader.java index 400e3d707..92fd51282 100644 --- a/java/google/registry/util/PosixTarHeader.java +++ b/java/google/registry/util/PosixTarHeader.java @@ -22,12 +22,10 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.DateTimeConstants.MILLIS_PER_SECOND; import static org.joda.time.DateTimeZone.UTC; -import org.joda.time.DateTime; - import java.util.Arrays; - import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; +import org.joda.time.DateTime; /** * POSIX Tar Header. diff --git a/java/google/registry/util/ResourceUtils.java b/java/google/registry/util/ResourceUtils.java index afa12072d..29a5a2e47 100644 --- a/java/google/registry/util/ResourceUtils.java +++ b/java/google/registry/util/ResourceUtils.java @@ -20,7 +20,6 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.io.ByteSource; import com.google.common.io.Resources; - import java.io.IOException; import java.net.URL; diff --git a/java/google/registry/util/Retrier.java b/java/google/registry/util/Retrier.java index a41a3a23e..6249d3e28 100644 --- a/java/google/registry/util/Retrier.java +++ b/java/google/registry/util/Retrier.java @@ -21,16 +21,12 @@ import static google.registry.util.PredicateUtils.supertypeOf; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; - import google.registry.config.ConfigModule.Config; - -import org.joda.time.Duration; - import java.io.Serializable; import java.util.Set; import java.util.concurrent.Callable; - import javax.inject.Inject; +import org.joda.time.Duration; /** Wrapper that does retry with exponential backoff. */ public class Retrier implements Serializable { diff --git a/java/google/registry/util/SendEmailService.java b/java/google/registry/util/SendEmailService.java index b307b8713..4a8d38957 100644 --- a/java/google/registry/util/SendEmailService.java +++ b/java/google/registry/util/SendEmailService.java @@ -15,7 +15,6 @@ package google.registry.util; import java.util.Properties; - import javax.mail.Message; import javax.mail.MessagingException; import javax.mail.Session; diff --git a/java/google/registry/util/SendEmailUtils.java b/java/google/registry/util/SendEmailUtils.java index 744a12be5..13f8329f9 100644 --- a/java/google/registry/util/SendEmailUtils.java +++ b/java/google/registry/util/SendEmailUtils.java @@ -21,12 +21,9 @@ import com.google.common.base.Joiner; import com.google.common.base.Predicates; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; - import google.registry.config.RegistryConfig; import google.registry.config.RegistryEnvironment; - import java.util.List; - import javax.mail.Message; import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; diff --git a/java/google/registry/util/SerializeUtils.java b/java/google/registry/util/SerializeUtils.java index caaadb4b6..40ecaa7ab 100644 --- a/java/google/registry/util/SerializeUtils.java +++ b/java/google/registry/util/SerializeUtils.java @@ -22,7 +22,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; - import javax.annotation.Nullable; /** Utilities for easy serialization with informative error messages. */ diff --git a/java/google/registry/util/Sleeper.java b/java/google/registry/util/Sleeper.java index 45858ad87..ffba19d8a 100644 --- a/java/google/registry/util/Sleeper.java +++ b/java/google/registry/util/Sleeper.java @@ -14,9 +14,8 @@ package google.registry.util; -import org.joda.time.ReadableDuration; - import javax.annotation.concurrent.ThreadSafe; +import org.joda.time.ReadableDuration; /** * An object which accepts requests to put the current thread to sleep. diff --git a/java/google/registry/util/SqlTemplate.java b/java/google/registry/util/SqlTemplate.java index f588db9af..c1c16a833 100644 --- a/java/google/registry/util/SqlTemplate.java +++ b/java/google/registry/util/SqlTemplate.java @@ -24,10 +24,8 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import com.google.re2j.Matcher; import com.google.re2j.Pattern; - import java.util.HashSet; import java.util.Set; - import javax.annotation.concurrent.Immutable; /** SQL template variable substitution. */ diff --git a/java/google/registry/util/SystemClock.java b/java/google/registry/util/SystemClock.java index 8e50303d6..40221369d 100644 --- a/java/google/registry/util/SystemClock.java +++ b/java/google/registry/util/SystemClock.java @@ -18,10 +18,8 @@ import static org.joda.time.DateTimeZone.UTC; import dagger.Module; import dagger.Provides; - -import org.joda.time.DateTime; - import javax.annotation.concurrent.ThreadSafe; +import org.joda.time.DateTime; /** Clock implementation that proxies to the real system clock. */ @ThreadSafe diff --git a/java/google/registry/util/SystemSleeper.java b/java/google/registry/util/SystemSleeper.java index cd3582aec..543c490bf 100644 --- a/java/google/registry/util/SystemSleeper.java +++ b/java/google/registry/util/SystemSleeper.java @@ -17,17 +17,13 @@ package google.registry.util; import static com.google.common.base.Preconditions.checkArgument; import com.google.common.util.concurrent.Uninterruptibles; - import dagger.Module; import dagger.Provides; - -import org.joda.time.ReadableDuration; - import java.io.Serializable; import java.util.concurrent.TimeUnit; - import javax.annotation.concurrent.ThreadSafe; import javax.inject.Inject; +import org.joda.time.ReadableDuration; /** Implementation of {@link Sleeper} for production use. */ @ThreadSafe diff --git a/java/google/registry/util/TaskEnqueuer.java b/java/google/registry/util/TaskEnqueuer.java index 4403de732..7624ebc2d 100644 --- a/java/google/registry/util/TaskEnqueuer.java +++ b/java/google/registry/util/TaskEnqueuer.java @@ -20,11 +20,9 @@ import com.google.appengine.api.taskqueue.Queue; import com.google.appengine.api.taskqueue.TaskHandle; import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TransientFailureException; - import java.io.Serializable; import java.util.List; import java.util.concurrent.Callable; - import javax.inject.Inject; /** Utilities for dealing with App Engine task queues. */ diff --git a/java/google/registry/util/TeeOutputStream.java b/java/google/registry/util/TeeOutputStream.java index 5b231a535..208b08cbe 100644 --- a/java/google/registry/util/TeeOutputStream.java +++ b/java/google/registry/util/TeeOutputStream.java @@ -18,10 +18,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; import com.google.common.collect.ImmutableList; - import java.io.IOException; import java.io.OutputStream; - import javax.annotation.WillNotClose; /** diff --git a/java/google/registry/util/TypeUtils.java b/java/google/registry/util/TypeUtils.java index bdd70fb46..ab3e9a31e 100644 --- a/java/google/registry/util/TypeUtils.java +++ b/java/google/registry/util/TypeUtils.java @@ -23,7 +23,6 @@ import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.reflect.TypeToken; - import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/java/google/registry/util/UrlFetchUtils.java b/java/google/registry/util/UrlFetchUtils.java index aa3d065ef..205d2fd27 100644 --- a/java/google/registry/util/UrlFetchUtils.java +++ b/java/google/registry/util/UrlFetchUtils.java @@ -28,7 +28,6 @@ import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.common.base.Optional; import com.google.common.net.MediaType; - import java.security.NoSuchAlgorithmException; import java.security.ProviderException; import java.security.SecureRandom; diff --git a/java/google/registry/util/X509Utils.java b/java/google/registry/util/X509Utils.java index cc29343e5..13609676c 100644 --- a/java/google/registry/util/X509Utils.java +++ b/java/google/registry/util/X509Utils.java @@ -23,7 +23,6 @@ import static java.nio.charset.StandardCharsets.US_ASCII; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -43,7 +42,6 @@ import java.security.cert.X509CRLEntry; import java.security.cert.X509Certificate; import java.util.Date; import java.util.NoSuchElementException; - import javax.annotation.Tainted; /** X.509 Public Key Infrastructure (PKI) helper functions. */ diff --git a/java/google/registry/util/XmlToEnumMapper.java b/java/google/registry/util/XmlToEnumMapper.java index 26fe32695..f64c6d29f 100644 --- a/java/google/registry/util/XmlToEnumMapper.java +++ b/java/google/registry/util/XmlToEnumMapper.java @@ -15,7 +15,6 @@ package google.registry.util; import com.google.common.collect.ImmutableMap; - import javax.xml.bind.annotation.XmlEnumValue; /** Efficient lookup from xml enums to java enums */ diff --git a/java/google/registry/whois/DomainLookupCommand.java b/java/google/registry/whois/DomainLookupCommand.java index 6e50a378b..8a1cd7caf 100644 --- a/java/google/registry/whois/DomainLookupCommand.java +++ b/java/google/registry/whois/DomainLookupCommand.java @@ -15,12 +15,9 @@ package google.registry.whois; import com.google.common.net.InternetDomainName; - import google.registry.model.domain.DomainResource; - -import org.joda.time.DateTime; - import javax.annotation.Nullable; +import org.joda.time.DateTime; /** Represents a WHOIS lookup on a domain name (i.e. SLD). */ class DomainLookupCommand extends DomainOrHostLookupCommand { diff --git a/java/google/registry/whois/DomainOrHostLookupCommand.java b/java/google/registry/whois/DomainOrHostLookupCommand.java index 03483399e..845151727 100644 --- a/java/google/registry/whois/DomainOrHostLookupCommand.java +++ b/java/google/registry/whois/DomainOrHostLookupCommand.java @@ -23,13 +23,10 @@ import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; import com.google.common.net.InternetDomainName; - import google.registry.model.EppResource; import google.registry.util.TypeUtils.TypeInstantiator; - -import org.joda.time.DateTime; - import javax.annotation.Nullable; +import org.joda.time.DateTime; /** Represents a WHOIS lookup on a domain name (i.e. SLD) or a nameserver. */ abstract class DomainOrHostLookupCommand implements WhoisCommand { diff --git a/java/google/registry/whois/DomainWhoisResponse.java b/java/google/registry/whois/DomainWhoisResponse.java index e881a3ef6..e71ef1f04 100644 --- a/java/google/registry/whois/DomainWhoisResponse.java +++ b/java/google/registry/whois/DomainWhoisResponse.java @@ -23,9 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Ref; - import google.registry.model.contact.ContactPhoneNumber; import google.registry.model.contact.ContactResource; import google.registry.model.contact.PostalInfo; @@ -37,12 +35,9 @@ import google.registry.model.eppcommon.StatusValue; import google.registry.model.registrar.Registrar; import google.registry.model.translators.EnumToAttributeAdapter.EppEnum; import google.registry.util.FormattingLogger; - -import org.joda.time.DateTime; - import java.util.Set; - import javax.annotation.Nullable; +import org.joda.time.DateTime; /** Represents a WHOIS response to a domain query. */ final class DomainWhoisResponse extends WhoisResponseImpl { diff --git a/java/google/registry/whois/NameserverLookupByHostCommand.java b/java/google/registry/whois/NameserverLookupByHostCommand.java index 304b28f67..24da87711 100644 --- a/java/google/registry/whois/NameserverLookupByHostCommand.java +++ b/java/google/registry/whois/NameserverLookupByHostCommand.java @@ -15,12 +15,9 @@ package google.registry.whois; import com.google.common.net.InternetDomainName; - import google.registry.model.host.HostResource; - -import org.joda.time.DateTime; - import javax.annotation.Nullable; +import org.joda.time.DateTime; /** Represents a WHOIS lookup on a nameserver based on its hostname. */ final class NameserverLookupByHostCommand extends DomainOrHostLookupCommand { diff --git a/java/google/registry/whois/NameserverLookupByIpCommand.java b/java/google/registry/whois/NameserverLookupByIpCommand.java index dcdbb65b6..5e40b6cc1 100644 --- a/java/google/registry/whois/NameserverLookupByIpCommand.java +++ b/java/google/registry/whois/NameserverLookupByIpCommand.java @@ -23,13 +23,10 @@ import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.net.InternetDomainName; - import google.registry.model.host.HostResource; import google.registry.model.registry.Registries; - -import org.joda.time.DateTime; - import java.net.InetAddress; +import org.joda.time.DateTime; /** * Represents a WHOIS lookup for a nameserver based on its IP. diff --git a/java/google/registry/whois/NameserverWhoisResponse.java b/java/google/registry/whois/NameserverWhoisResponse.java index 72a1c562a..3246783cc 100644 --- a/java/google/registry/whois/NameserverWhoisResponse.java +++ b/java/google/registry/whois/NameserverWhoisResponse.java @@ -19,13 +19,10 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.net.InetAddresses; - import google.registry.model.host.HostResource; import google.registry.model.registrar.Registrar; - -import org.joda.time.DateTime; - import java.net.InetAddress; +import org.joda.time.DateTime; /** Container for WHOIS responses to a nameserver lookup queries. */ final class NameserverWhoisResponse extends WhoisResponseImpl { diff --git a/java/google/registry/whois/RegistrarLookupCommand.java b/java/google/registry/whois/RegistrarLookupCommand.java index b754b2703..ca7f090ca 100644 --- a/java/google/registry/whois/RegistrarLookupCommand.java +++ b/java/google/registry/whois/RegistrarLookupCommand.java @@ -26,15 +26,12 @@ import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; - import google.registry.model.registrar.Registrar; import google.registry.util.FormattingLogger; - -import org.joda.time.DateTime; - import java.util.HashMap; import java.util.List; import java.util.Map; +import org.joda.time.DateTime; /** Represents a WHOIS lookup for a registrar by its name. */ final class RegistrarLookupCommand implements WhoisCommand { diff --git a/java/google/registry/whois/RegistrarWhoisResponse.java b/java/google/registry/whois/RegistrarWhoisResponse.java index ca14493f1..78af9bcea 100644 --- a/java/google/registry/whois/RegistrarWhoisResponse.java +++ b/java/google/registry/whois/RegistrarWhoisResponse.java @@ -18,12 +18,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; - -import org.joda.time.DateTime; - import java.util.Set; - import javax.annotation.Nullable; +import org.joda.time.DateTime; /** Container for WHOIS responses to registrar lookup queries. */ class RegistrarWhoisResponse extends WhoisResponseImpl { diff --git a/java/google/registry/whois/Whois.java b/java/google/registry/whois/Whois.java index c0f4c31e2..702341f22 100644 --- a/java/google/registry/whois/Whois.java +++ b/java/google/registry/whois/Whois.java @@ -15,13 +15,10 @@ package google.registry.whois; import google.registry.util.Clock; - -import org.joda.time.DateTime; - import java.io.IOException; import java.io.StringReader; - import javax.inject.Inject; +import org.joda.time.DateTime; /** High-level WHOIS API for other packages. */ public final class Whois { diff --git a/java/google/registry/whois/WhoisException.java b/java/google/registry/whois/WhoisException.java index 9c3e4cc3d..4127ce615 100644 --- a/java/google/registry/whois/WhoisException.java +++ b/java/google/registry/whois/WhoisException.java @@ -17,9 +17,8 @@ package google.registry.whois; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import org.joda.time.DateTime; - import javax.annotation.Nullable; +import org.joda.time.DateTime; /** Exception that gets thrown when WHOIS command isn't successful. */ public final class WhoisException extends Exception implements WhoisResponse { diff --git a/java/google/registry/whois/WhoisHttpServer.java b/java/google/registry/whois/WhoisHttpServer.java index 7d555a483..15ff69900 100644 --- a/java/google/registry/whois/WhoisHttpServer.java +++ b/java/google/registry/whois/WhoisHttpServer.java @@ -27,24 +27,20 @@ import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.base.Joiner; import com.google.common.base.Splitter; - import google.registry.config.ConfigModule.Config; import google.registry.request.Action; import google.registry.request.RequestPath; import google.registry.request.Response; import google.registry.util.Clock; import google.registry.util.FormattingLogger; - -import org.joda.time.DateTime; -import org.joda.time.Duration; - import java.io.IOException; import java.io.Reader; import java.io.StringReader; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; - import javax.inject.Inject; +import org.joda.time.DateTime; +import org.joda.time.Duration; /** * Human-Friendly HTTP WHOIS API diff --git a/java/google/registry/whois/WhoisModule.java b/java/google/registry/whois/WhoisModule.java index fd7a0585c..fb27911ac 100644 --- a/java/google/registry/whois/WhoisModule.java +++ b/java/google/registry/whois/WhoisModule.java @@ -16,10 +16,8 @@ package google.registry.whois; import dagger.Module; import dagger.Provides; - import java.io.IOException; import java.io.Reader; - import javax.servlet.http.HttpServletRequest; /** diff --git a/java/google/registry/whois/WhoisReader.java b/java/google/registry/whois/WhoisReader.java index b72debd8e..bbf25773b 100644 --- a/java/google/registry/whois/WhoisReader.java +++ b/java/google/registry/whois/WhoisReader.java @@ -25,13 +25,11 @@ import com.google.common.base.Optional; import com.google.common.io.CharStreams; import com.google.common.net.InetAddresses; import com.google.common.net.InternetDomainName; - -import org.joda.time.DateTime; - import java.io.IOException; import java.io.Reader; import java.util.ArrayList; import java.util.List; +import org.joda.time.DateTime; /** * The WhoisReader class understands how to read the WHOIS command from some source, parse it, and diff --git a/java/google/registry/whois/WhoisResponseImpl.java b/java/google/registry/whois/WhoisResponseImpl.java index 62c03934b..05180e40d 100644 --- a/java/google/registry/whois/WhoisResponseImpl.java +++ b/java/google/registry/whois/WhoisResponseImpl.java @@ -27,21 +27,17 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.Iterables; import com.google.common.collect.Ordering; import com.google.common.io.Resources; - import google.registry.model.eppcommon.Address; import google.registry.model.registrar.Registrar; import google.registry.util.Idn; import google.registry.xml.UtcDateTimeAdapter; - -import org.joda.time.DateTime; - import java.io.IOException; import java.net.URL; import java.util.Arrays; import java.util.List; import java.util.Set; - import javax.annotation.Nullable; +import org.joda.time.DateTime; /** Base class for responses to WHOIS queries. */ abstract class WhoisResponseImpl implements WhoisResponse { diff --git a/java/google/registry/whois/WhoisServer.java b/java/google/registry/whois/WhoisServer.java index b78c0cfbe..a021d1fa0 100644 --- a/java/google/registry/whois/WhoisServer.java +++ b/java/google/registry/whois/WhoisServer.java @@ -18,17 +18,13 @@ import static google.registry.request.Action.Method.POST; import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.net.MediaType; - import google.registry.request.Action; import google.registry.request.Response; import google.registry.util.Clock; import google.registry.util.FormattingLogger; - -import org.joda.time.DateTime; - import java.io.Reader; - import javax.inject.Inject; +import org.joda.time.DateTime; /** * HTTP request handler for WHOIS protocol requests sent to us by a proxy. diff --git a/java/google/registry/xjc/XjcObject.java b/java/google/registry/xjc/XjcObject.java index 26a57d753..51429712e 100644 --- a/java/google/registry/xjc/XjcObject.java +++ b/java/google/registry/xjc/XjcObject.java @@ -15,11 +15,9 @@ package google.registry.xjc; import google.registry.xml.XmlException; - import java.io.OutputStream; import java.io.StringWriter; import java.nio.charset.Charset; - import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; diff --git a/java/google/registry/xjc/XjcXmlTransformer.java b/java/google/registry/xjc/XjcXmlTransformer.java index 5bfa224e6..357015ac0 100644 --- a/java/google/registry/xjc/XjcXmlTransformer.java +++ b/java/google/registry/xjc/XjcXmlTransformer.java @@ -18,10 +18,8 @@ import static google.registry.xml.ValidationMode.LENIENT; import static google.registry.xml.ValidationMode.STRICT; import com.google.common.collect.ImmutableMap; - import google.registry.xml.XmlException; import google.registry.xml.XmlTransformer; - import java.io.InputStream; import java.io.OutputStream; import java.io.Writer; diff --git a/java/google/registry/xml/DateAdapter.java b/java/google/registry/xml/DateAdapter.java index f55da17a9..2be351db7 100644 --- a/java/google/registry/xml/DateAdapter.java +++ b/java/google/registry/xml/DateAdapter.java @@ -17,13 +17,12 @@ package google.registry.xml; import static com.google.common.base.Strings.isNullOrEmpty; import static org.joda.time.DateTimeZone.UTC; -import org.joda.time.LocalDate; -import org.joda.time.format.DateTimeFormatter; -import org.joda.time.format.ISODateTimeFormat; - import javax.annotation.CheckForNull; import javax.annotation.Nullable; import javax.xml.bind.annotation.adapters.XmlAdapter; +import org.joda.time.LocalDate; +import org.joda.time.format.DateTimeFormatter; +import org.joda.time.format.ISODateTimeFormat; /** * Adapter to use Joda {@link LocalDate} when marshalling the XML Schema {@code date} type. diff --git a/java/google/registry/xml/PeriodAdapter.java b/java/google/registry/xml/PeriodAdapter.java index 32806d3f1..0ad158d20 100644 --- a/java/google/registry/xml/PeriodAdapter.java +++ b/java/google/registry/xml/PeriodAdapter.java @@ -16,10 +16,9 @@ package google.registry.xml; import static com.google.common.base.Strings.isNullOrEmpty; -import org.joda.time.Period; - import javax.annotation.Nullable; import javax.xml.bind.annotation.adapters.XmlAdapter; +import org.joda.time.Period; /** Adapter to use Joda {@link Period} when marshalling XML. */ public class PeriodAdapter extends XmlAdapter { diff --git a/java/google/registry/xml/UtcDateTimeAdapter.java b/java/google/registry/xml/UtcDateTimeAdapter.java index fd766bc4e..f79ddb625 100644 --- a/java/google/registry/xml/UtcDateTimeAdapter.java +++ b/java/google/registry/xml/UtcDateTimeAdapter.java @@ -17,13 +17,12 @@ package google.registry.xml; import static com.google.common.base.Strings.isNullOrEmpty; import static org.joda.time.DateTimeZone.UTC; -import org.joda.time.DateTime; -import org.joda.time.format.DateTimeFormatter; -import org.joda.time.format.ISODateTimeFormat; - import javax.annotation.CheckForNull; import javax.annotation.Nullable; import javax.xml.bind.annotation.adapters.XmlAdapter; +import org.joda.time.DateTime; +import org.joda.time.format.DateTimeFormatter; +import org.joda.time.format.ISODateTimeFormat; /** * Adapter to use Joda {@link DateTime} when marshalling XML timestamps. diff --git a/java/google/registry/xml/XmlFragmentMarshaller.java b/java/google/registry/xml/XmlFragmentMarshaller.java index 5235ca3c6..daf3770a8 100644 --- a/java/google/registry/xml/XmlFragmentMarshaller.java +++ b/java/google/registry/xml/XmlFragmentMarshaller.java @@ -19,9 +19,7 @@ import static com.google.common.base.Verify.verify; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.re2j.Pattern; - import java.io.ByteArrayOutputStream; - import javax.annotation.concurrent.NotThreadSafe; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; diff --git a/java/google/registry/xml/XmlTransformer.java b/java/google/registry/xml/XmlTransformer.java index 059e00687..0aeb1d47e 100644 --- a/java/google/registry/xml/XmlTransformer.java +++ b/java/google/registry/xml/XmlTransformer.java @@ -24,10 +24,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.io.Closer; import com.google.common.io.Resources; - -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -38,7 +34,6 @@ import java.nio.charset.Charset; import java.util.Collection; import java.util.List; import java.util.Map; - import javax.annotation.Nullable; import javax.xml.XMLConstants; import javax.xml.bind.JAXBContext; @@ -59,6 +54,8 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; /** Static methods for marshaling, unmarshaling, and validating XML. */ public class XmlTransformer { diff --git a/javatests/google/registry/backup/CommitLogCheckpointActionTest.java b/javatests/google/registry/backup/CommitLogCheckpointActionTest.java index 7ce5bccec..f059278e9 100644 --- a/javatests/google/registry/backup/CommitLogCheckpointActionTest.java +++ b/javatests/google/registry/backup/CommitLogCheckpointActionTest.java @@ -24,7 +24,6 @@ import static org.joda.time.DateTimeZone.UTC; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; - import google.registry.model.ofy.CommitLogCheckpoint; import google.registry.model.ofy.CommitLogCheckpointRoot; import google.registry.testing.AppEngineRule; @@ -32,7 +31,6 @@ import google.registry.testing.FakeClock; import google.registry.testing.TaskQueueHelper.TaskMatcher; import google.registry.util.Retrier; import google.registry.util.TaskEnqueuer; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/backup/CommitLogCheckpointStrategyTest.java b/javatests/google/registry/backup/CommitLogCheckpointStrategyTest.java index 7bb85620f..115f70e25 100644 --- a/javatests/google/registry/backup/CommitLogCheckpointStrategyTest.java +++ b/javatests/google/registry/backup/CommitLogCheckpointStrategyTest.java @@ -23,9 +23,7 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; - import com.googlecode.objectify.VoidWork; - import google.registry.config.TestRegistryConfig; import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; @@ -37,7 +35,6 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; import google.registry.testing.RegistryConfigRule; - import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Before; diff --git a/javatests/google/registry/backup/DeleteOldCommitLogsActionTest.java b/javatests/google/registry/backup/DeleteOldCommitLogsActionTest.java index 36c85d0df..0c7796f6a 100644 --- a/javatests/google/registry/backup/DeleteOldCommitLogsActionTest.java +++ b/javatests/google/registry/backup/DeleteOldCommitLogsActionTest.java @@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.joda.time.Duration.millis; import com.googlecode.objectify.VoidWork; - import google.registry.config.TestRegistryConfig; import google.registry.model.ofy.CommitLogManifest; import google.registry.model.ofy.CommitLogMutation; @@ -28,7 +27,6 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; import google.registry.testing.RegistryConfigRule; - import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Before; diff --git a/javatests/google/registry/backup/ExportCommitLogDiffActionTest.java b/javatests/google/registry/backup/ExportCommitLogDiffActionTest.java index b6f8bf365..0d3891273 100644 --- a/javatests/google/registry/backup/ExportCommitLogDiffActionTest.java +++ b/javatests/google/registry/backup/ExportCommitLogDiffActionTest.java @@ -28,10 +28,8 @@ import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.appengine.tools.cloudstorage.GcsService; import com.google.appengine.tools.cloudstorage.GcsServiceFactory; import com.google.common.collect.ImmutableMap; - import com.googlecode.objectify.Key; import com.googlecode.objectify.ObjectifyService; - import google.registry.config.TestRegistryConfig; import google.registry.model.ImmutableObject; import google.registry.model.ofy.CommitLogBucket; @@ -42,7 +40,7 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.GcsTestingUtils; import google.registry.testing.RegistryConfigRule; import google.registry.testing.TestObject; - +import java.util.List; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; @@ -50,8 +48,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.List; - /** Unit tests for {@link ExportCommitLogDiffAction}. */ @RunWith(JUnit4.class) public class ExportCommitLogDiffActionTest { diff --git a/javatests/google/registry/backup/GcsDiffFileListerTest.java b/javatests/google/registry/backup/GcsDiffFileListerTest.java index a0e8e6f10..444ecd15e 100644 --- a/javatests/google/registry/backup/GcsDiffFileListerTest.java +++ b/javatests/google/registry/backup/GcsDiffFileListerTest.java @@ -31,25 +31,21 @@ import com.google.appengine.tools.cloudstorage.ListItem; import com.google.appengine.tools.cloudstorage.ListResult; import com.google.common.base.Function; import com.google.common.collect.Iterators; - import com.googlecode.objectify.ObjectifyService; - import google.registry.testing.AppEngineRule; import google.registry.testing.TestObject; - -import org.joda.time.DateTime; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.nio.ByteBuffer; import java.util.Iterator; import java.util.List; import java.util.concurrent.Callable; +import org.joda.time.DateTime; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** Unit tests for {@link GcsDiffFileLister}. */ @RunWith(JUnit4.class) diff --git a/javatests/google/registry/backup/RestoreCommitLogsActionTest.java b/javatests/google/registry/backup/RestoreCommitLogsActionTest.java index 7707910a5..d55bd88c0 100644 --- a/javatests/google/registry/backup/RestoreCommitLogsActionTest.java +++ b/javatests/google/registry/backup/RestoreCommitLogsActionTest.java @@ -38,10 +38,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.primitives.Longs; - import com.googlecode.objectify.Key; import com.googlecode.objectify.ObjectifyService; - import google.registry.config.TestRegistryConfig; import google.registry.model.ImmutableObject; import google.registry.model.ofy.CommitLogBucket; @@ -55,20 +53,18 @@ import google.registry.testing.FakeSleeper; import google.registry.testing.RegistryConfigRule; import google.registry.testing.TestObject; import google.registry.util.Retrier; - -import org.joda.time.DateTime; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.ByteBuffer; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import org.joda.time.DateTime; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** Unit tests for {@link RestoreCommitLogsAction}. */ @RunWith(JUnit4.class) diff --git a/javatests/google/registry/bigquery/BigqueryFactoryTest.java b/javatests/google/registry/bigquery/BigqueryFactoryTest.java index b7f90515a..5d1179006 100644 --- a/javatests/google/registry/bigquery/BigqueryFactoryTest.java +++ b/javatests/google/registry/bigquery/BigqueryFactoryTest.java @@ -32,7 +32,6 @@ import com.google.api.services.bigquery.model.TableFieldSchema; import com.google.api.services.bigquery.model.TableReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/bigquery/BigqueryUtilsTest.java b/javatests/google/registry/bigquery/BigqueryUtilsTest.java index 46fe231d4..9255f97a5 100644 --- a/javatests/google/registry/bigquery/BigqueryUtilsTest.java +++ b/javatests/google/registry/bigquery/BigqueryUtilsTest.java @@ -23,9 +23,8 @@ import static google.registry.util.DateTimeUtils.END_OF_TIME; import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.api.services.bigquery.model.JobReference; - import google.registry.testing.ExceptionRule; - +import java.util.concurrent.TimeUnit; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Rule; @@ -33,8 +32,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.concurrent.TimeUnit; - /** Unit tests for {@link BigqueryUtils}. */ @RunWith(JUnit4.class) public class BigqueryUtilsTest { diff --git a/javatests/google/registry/billing/ExpandRecurringBillingEventsActionTest.java b/javatests/google/registry/billing/ExpandRecurringBillingEventsActionTest.java index 539780d92..91e2dd4de 100644 --- a/javatests/google/registry/billing/ExpandRecurringBillingEventsActionTest.java +++ b/javatests/google/registry/billing/ExpandRecurringBillingEventsActionTest.java @@ -30,10 +30,8 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Iterables; - import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; - import google.registry.mapreduce.MapreduceRunner; import google.registry.model.billing.BillingEvent; import google.registry.model.billing.BillingEvent.Flag; @@ -46,7 +44,8 @@ import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; import google.registry.testing.mapreduce.MapreduceTestCase; - +import java.util.ArrayList; +import java.util.List; import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; @@ -55,9 +54,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.ArrayList; -import java.util.List; - /** Unit tests for {@link ExpandRecurringBillingEventsAction}. */ @RunWith(JUnit4.class) public class ExpandRecurringBillingEventsActionTest diff --git a/javatests/google/registry/cron/CommitLogFanoutActionTest.java b/javatests/google/registry/cron/CommitLogFanoutActionTest.java index f4bee9bfa..cdc98d58c 100644 --- a/javatests/google/registry/cron/CommitLogFanoutActionTest.java +++ b/javatests/google/registry/cron/CommitLogFanoutActionTest.java @@ -19,22 +19,19 @@ import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; import com.google.common.base.Joiner; import com.google.common.base.Optional; - import google.registry.model.ofy.CommitLogBucket; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.TaskQueueHelper.TaskMatcher; import google.registry.util.Retrier; import google.registry.util.TaskEnqueuer; - +import java.util.ArrayList; +import java.util.List; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.ArrayList; -import java.util.List; - /** Unit tests for {@link CommitLogFanoutAction}. */ @RunWith(JUnit4.class) public class CommitLogFanoutActionTest { diff --git a/javatests/google/registry/cron/TldFanoutActionTest.java b/javatests/google/registry/cron/TldFanoutActionTest.java index 580c71d69..a1fac4c0e 100644 --- a/javatests/google/registry/cron/TldFanoutActionTest.java +++ b/javatests/google/registry/cron/TldFanoutActionTest.java @@ -28,7 +28,6 @@ import com.google.common.base.Optional; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableSet; - import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.TldType; import google.registry.testing.AppEngineRule; @@ -36,7 +35,6 @@ import google.registry.testing.ExceptionRule; import google.registry.testing.TaskQueueHelper.TaskMatcher; import google.registry.util.Retrier; import google.registry.util.TaskEnqueuer; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/dns/DnsInjectionTest.java b/javatests/google/registry/dns/DnsInjectionTest.java index e1564cae3..b5636b979 100644 --- a/javatests/google/registry/dns/DnsInjectionTest.java +++ b/javatests/google/registry/dns/DnsInjectionTest.java @@ -29,7 +29,10 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; - +import java.io.PrintWriter; +import java.io.StringWriter; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; @@ -37,12 +40,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.PrintWriter; -import java.io.StringWriter; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** Unit tests for Dagger injection of the DNS package. */ @RunWith(JUnit4.class) public final class DnsInjectionTest { diff --git a/javatests/google/registry/dns/DnsQueueTest.java b/javatests/google/registry/dns/DnsQueueTest.java index 04e859a5c..189b4459c 100644 --- a/javatests/google/registry/dns/DnsQueueTest.java +++ b/javatests/google/registry/dns/DnsQueueTest.java @@ -22,7 +22,6 @@ import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.TaskQueueHelper.TaskMatcher; - import org.joda.time.Duration; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/dns/DnsTestComponent.java b/javatests/google/registry/dns/DnsTestComponent.java index 5feae49fa..08c4c30f1 100644 --- a/javatests/google/registry/dns/DnsTestComponent.java +++ b/javatests/google/registry/dns/DnsTestComponent.java @@ -15,7 +15,6 @@ package google.registry.dns; import dagger.Component; - import google.registry.config.ConfigModule; import google.registry.dns.writer.api.VoidDnsWriterModule; import google.registry.module.backend.BackendModule; diff --git a/javatests/google/registry/dns/PublishDnsUpdatesActionTest.java b/javatests/google/registry/dns/PublishDnsUpdatesActionTest.java index d55e6279e..5c927467e 100644 --- a/javatests/google/registry/dns/PublishDnsUpdatesActionTest.java +++ b/javatests/google/registry/dns/PublishDnsUpdatesActionTest.java @@ -22,14 +22,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import com.google.common.collect.ImmutableSet; - import google.registry.dns.writer.api.DnsWriter; import google.registry.model.domain.DomainResource; import google.registry.model.ofy.Ofy; import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; - +import javax.inject.Provider; import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Before; @@ -39,8 +38,6 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; -import javax.inject.Provider; - /** Unit tests for {@link WriteDnsAction}. */ @RunWith(MockitoJUnitRunner.class) public class PublishDnsUpdatesActionTest { diff --git a/javatests/google/registry/dns/ReadDnsQueueActionTest.java b/javatests/google/registry/dns/ReadDnsQueueActionTest.java index f30127bc8..7dfea9483 100644 --- a/javatests/google/registry/dns/ReadDnsQueueActionTest.java +++ b/javatests/google/registry/dns/ReadDnsQueueActionTest.java @@ -33,7 +33,6 @@ import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.net.InternetDomainName; - import google.registry.dns.DnsConstants.TargetType; import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.TldType; @@ -43,7 +42,8 @@ import google.registry.testing.FakeClock; import google.registry.testing.TaskQueueHelper.TaskMatcher; import google.registry.util.Retrier; import google.registry.util.TaskEnqueuer; - +import java.util.ArrayList; +import java.util.List; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.Duration; @@ -53,9 +53,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.ArrayList; -import java.util.List; - /** Unit tests for {@link ReadDnsQueueAction}. */ @RunWith(JUnit4.class) public class ReadDnsQueueActionTest { diff --git a/javatests/google/registry/dns/RefreshDnsActionTest.java b/javatests/google/registry/dns/RefreshDnsActionTest.java index c5ed32aa2..8045411c1 100644 --- a/javatests/google/registry/dns/RefreshDnsActionTest.java +++ b/javatests/google/registry/dns/RefreshDnsActionTest.java @@ -29,7 +29,6 @@ import google.registry.request.HttpException.NotFoundException; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/dns/WriteDnsActionTest.java b/javatests/google/registry/dns/WriteDnsActionTest.java index fc884bb69..9bf66dd7d 100644 --- a/javatests/google/registry/dns/WriteDnsActionTest.java +++ b/javatests/google/registry/dns/WriteDnsActionTest.java @@ -27,14 +27,13 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import com.google.appengine.api.taskqueue.QueueFactory; - import google.registry.dns.writer.api.DnsWriter; import google.registry.model.ofy.Ofy; import google.registry.model.registry.Registry; import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; - +import javax.inject.Provider; import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.After; @@ -45,8 +44,6 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; -import javax.inject.Provider; - /** Unit tests for {@link WriteDnsAction}. */ @RunWith(MockitoJUnitRunner.class) public class WriteDnsActionTest { diff --git a/javatests/google/registry/dns/writer/dnsupdate/DnsMessageTransportTest.java b/javatests/google/registry/dns/writer/dnsupdate/DnsMessageTransportTest.java index 419d79a94..f3db72297 100644 --- a/javatests/google/registry/dns/writer/dnsupdate/DnsMessageTransportTest.java +++ b/javatests/google/registry/dns/writer/dnsupdate/DnsMessageTransportTest.java @@ -22,9 +22,17 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.base.VerifyException; - import google.registry.testing.ExceptionRule; - +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.EOFException; +import java.io.InputStream; +import java.net.InetAddress; +import java.net.Socket; +import java.net.SocketTimeoutException; +import java.nio.ByteBuffer; +import java.util.Arrays; +import javax.net.SocketFactory; import org.joda.time.Duration; import org.junit.Before; import org.junit.Rule; @@ -43,18 +51,6 @@ import org.xbill.DNS.Record; import org.xbill.DNS.Type; import org.xbill.DNS.Update; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.EOFException; -import java.io.InputStream; -import java.net.InetAddress; -import java.net.Socket; -import java.net.SocketTimeoutException; -import java.nio.ByteBuffer; -import java.util.Arrays; - -import javax.net.SocketFactory; - /** Unit tests for {@link DnsMessageTransport}. */ @RunWith(MockitoJUnitRunner.class) public class DnsMessageTransportTest { diff --git a/javatests/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java b/javatests/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java index 50dcb5888..bc69bd281 100644 --- a/javatests/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java +++ b/javatests/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java @@ -32,9 +32,7 @@ import com.google.common.base.VerifyException; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; - import com.googlecode.objectify.Ref; - import google.registry.model.domain.DomainResource; import google.registry.model.domain.secdns.DelegationSignerData; import google.registry.model.eppcommon.StatusValue; @@ -44,7 +42,8 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; - +import java.util.ArrayList; +import java.util.Iterator; import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Before; @@ -65,9 +64,6 @@ import org.xbill.DNS.Section; import org.xbill.DNS.Type; import org.xbill.DNS.Update; -import java.util.ArrayList; -import java.util.Iterator; - /** Unit tests for {@link DnsUpdateWriter}. */ @RunWith(MockitoJUnitRunner.class) public class DnsUpdateWriterTest { diff --git a/javatests/google/registry/export/BigqueryPollJobActionTest.java b/javatests/google/registry/export/BigqueryPollJobActionTest.java index 25d877ca6..6daaa834b 100644 --- a/javatests/google/registry/export/BigqueryPollJobActionTest.java +++ b/javatests/google/registry/export/BigqueryPollJobActionTest.java @@ -31,9 +31,7 @@ import com.google.appengine.api.taskqueue.QueueFactory; import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TaskOptions.Method; import com.google.appengine.api.taskqueue.dev.QueueStateInfo.TaskStateInfo; - import dagger.Lazy; - import google.registry.export.BigqueryPollJobAction.BigqueryPollJobEnqueuer; import google.registry.request.HttpException.BadRequestException; import google.registry.request.HttpException.NotModifiedException; @@ -46,14 +44,6 @@ import google.registry.testing.TaskQueueHelper.TaskMatcher; import google.registry.util.CapturingLogHandler; import google.registry.util.Retrier; import google.registry.util.TaskEnqueuer; - -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -62,6 +52,12 @@ import java.io.ObjectOutputStream; import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.runners.MockitoJUnitRunner; /** Unit tests for {@link BigqueryPollJobAction}. */ @RunWith(MockitoJUnitRunner.class) diff --git a/javatests/google/registry/export/CheckSnapshotServletTest.java b/javatests/google/registry/export/CheckSnapshotServletTest.java index 9de1cb921..a69d71594 100644 --- a/javatests/google/registry/export/CheckSnapshotServletTest.java +++ b/javatests/google/registry/export/CheckSnapshotServletTest.java @@ -31,12 +31,15 @@ import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; import google.registry.testing.TaskQueueHelper.TaskMatcher; - +import java.io.PrintWriter; +import java.io.StringWriter; +import javax.servlet.ServletConfig; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Before; @@ -46,13 +49,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import java.io.PrintWriter; -import java.io.StringWriter; - -import javax.servlet.ServletConfig; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** Unit tests for {@link CheckSnapshotServlet}. */ @RunWith(MockitoJUnitRunner.class) public class CheckSnapshotServletTest { diff --git a/javatests/google/registry/export/DatastoreBackupInfoTest.java b/javatests/google/registry/export/DatastoreBackupInfoTest.java index f3dd750bf..a10fad4c0 100644 --- a/javatests/google/registry/export/DatastoreBackupInfoTest.java +++ b/javatests/google/registry/export/DatastoreBackupInfoTest.java @@ -21,13 +21,12 @@ import com.google.appengine.api.datastore.Entity; import com.google.appengine.api.datastore.EntityNotFoundException; import com.google.appengine.api.datastore.Text; import com.google.common.collect.ImmutableList; - import google.registry.export.DatastoreBackupInfo.BackupStatus; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; - +import java.util.Date; import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Before; @@ -36,8 +35,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.Date; - /** Unit tests for {@link DatastoreBackupInfo}. */ @RunWith(JUnit4.class) public class DatastoreBackupInfoTest { diff --git a/javatests/google/registry/export/DatastoreBackupServiceTest.java b/javatests/google/registry/export/DatastoreBackupServiceTest.java index 6bf9822a1..19ccb07ec 100644 --- a/javatests/google/registry/export/DatastoreBackupServiceTest.java +++ b/javatests/google/registry/export/DatastoreBackupServiceTest.java @@ -25,12 +25,11 @@ import com.google.appengine.api.modules.ModulesService; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.InjectRule; import google.registry.testing.TaskQueueHelper.TaskMatcher; - +import java.util.Date; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; @@ -39,8 +38,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import java.util.Date; - /** Unit tests for {@link DatastoreBackupService}. */ @RunWith(MockitoJUnitRunner.class) public class DatastoreBackupServiceTest { diff --git a/javatests/google/registry/export/ExportConstantsTest.java b/javatests/google/registry/export/ExportConstantsTest.java index 7e84fad4b..6b3f558d9 100644 --- a/javatests/google/registry/export/ExportConstantsTest.java +++ b/javatests/google/registry/export/ExportConstantsTest.java @@ -26,20 +26,15 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; import com.google.common.io.Resources; import com.google.re2j.Pattern; - import com.googlecode.objectify.annotation.Entity; - import google.registry.model.ImmutableObject; - +import java.net.URL; +import java.util.List; +import javax.annotation.Nullable; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.net.URL; -import java.util.List; - -import javax.annotation.Nullable; - /** Unit tests for {@link ExportConstants}. */ @RunWith(JUnit4.class) public class ExportConstantsTest { diff --git a/javatests/google/registry/export/ExportDomainListsActionTest.java b/javatests/google/registry/export/ExportDomainListsActionTest.java index ee3dd6c83..97e9cd170 100644 --- a/javatests/google/registry/export/ExportDomainListsActionTest.java +++ b/javatests/google/registry/export/ExportDomainListsActionTest.java @@ -30,14 +30,13 @@ import com.google.appengine.tools.cloudstorage.ListOptions; import com.google.appengine.tools.cloudstorage.ListResult; import com.google.common.base.Optional; import com.google.common.base.Splitter; - import google.registry.mapreduce.MapreduceRunner; import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.TldType; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeResponse; import google.registry.testing.mapreduce.MapreduceTestCase; - +import java.io.FileNotFoundException; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; @@ -45,8 +44,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.FileNotFoundException; - /** Unit tests for {@link ExportDomainListsAction}. */ @RunWith(JUnit4.class) public class ExportDomainListsActionTest extends MapreduceTestCase { diff --git a/javatests/google/registry/export/ExportReservedTermsActionTest.java b/javatests/google/registry/export/ExportReservedTermsActionTest.java index 34a6cf821..d5641749f 100644 --- a/javatests/google/registry/export/ExportReservedTermsActionTest.java +++ b/javatests/google/registry/export/ExportReservedTermsActionTest.java @@ -29,7 +29,6 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableSet; import com.google.common.net.MediaType; - import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.RegistryNotFoundException; import google.registry.model.registry.label.ReservedList; @@ -38,7 +37,7 @@ import google.registry.storage.drive.DriveConnection; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.InjectRule; - +import java.io.IOException; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -46,8 +45,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import java.io.IOException; - /** Unit tests for {@link ExportReservedTermsAction}. */ @RunWith(MockitoJUnitRunner.class) public class ExportReservedTermsActionTest { diff --git a/javatests/google/registry/export/ExportSnapshotServletTest.java b/javatests/google/registry/export/ExportSnapshotServletTest.java index 6cc99161e..c2e2bbc97 100644 --- a/javatests/google/registry/export/ExportSnapshotServletTest.java +++ b/javatests/google/registry/export/ExportSnapshotServletTest.java @@ -23,7 +23,11 @@ import google.registry.config.TestRegistryConfig; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; import google.registry.testing.RegistryConfigRule; - +import java.io.PrintWriter; +import java.io.StringWriter; +import javax.servlet.ServletConfig; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; @@ -32,13 +36,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import java.io.PrintWriter; -import java.io.StringWriter; - -import javax.servlet.ServletConfig; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** Unit tests for {@link ExportSnapshotServlet}. */ @RunWith(MockitoJUnitRunner.class) public class ExportSnapshotServletTest { diff --git a/javatests/google/registry/export/ExportUtilsTest.java b/javatests/google/registry/export/ExportUtilsTest.java index b2a3e34dc..995476242 100644 --- a/javatests/google/registry/export/ExportUtilsTest.java +++ b/javatests/google/registry/export/ExportUtilsTest.java @@ -22,7 +22,6 @@ import static google.registry.testing.DatastoreHelper.persistResource; import google.registry.model.registry.Registry; import google.registry.model.registry.label.ReservedList; import google.registry.testing.AppEngineRule; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/export/LoadSnapshotActionTest.java b/javatests/google/registry/export/LoadSnapshotActionTest.java index 9a75c612c..1f072038b 100644 --- a/javatests/google/registry/export/LoadSnapshotActionTest.java +++ b/javatests/google/registry/export/LoadSnapshotActionTest.java @@ -39,7 +39,6 @@ import com.google.appengine.api.taskqueue.QueueFactory; import com.google.common.base.Function; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; - import google.registry.bigquery.BigqueryFactory; import google.registry.export.BigqueryPollJobAction.BigqueryPollJobEnqueuer; import google.registry.request.HttpException.BadRequestException; @@ -48,7 +47,8 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; import google.registry.testing.TaskQueueHelper.TaskMatcher; - +import java.io.IOException; +import java.util.List; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; @@ -58,9 +58,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import java.io.IOException; -import java.util.List; - /** Unit tests for {@link LoadSnapshotAction}. */ @RunWith(MockitoJUnitRunner.class) public class LoadSnapshotActionTest { diff --git a/javatests/google/registry/export/PublishDetailReportActionTest.java b/javatests/google/registry/export/PublishDetailReportActionTest.java index ff6acc391..79f9fd9e0 100644 --- a/javatests/google/registry/export/PublishDetailReportActionTest.java +++ b/javatests/google/registry/export/PublishDetailReportActionTest.java @@ -32,7 +32,6 @@ import com.google.appengine.tools.cloudstorage.GcsService; import com.google.appengine.tools.cloudstorage.GcsServiceFactory; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; - import google.registry.gcs.GcsUtils; import google.registry.model.registrar.Registrar; import google.registry.request.HttpException.BadRequestException; @@ -40,7 +39,9 @@ import google.registry.request.HttpException.InternalServerErrorException; import google.registry.storage.drive.DriveConnection; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; - +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.Map; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -48,10 +49,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.Map; - /** Unit tests for {@link PublishDetailReportAction}. */ @RunWith(MockitoJUnitRunner.class) public class PublishDetailReportActionTest { diff --git a/javatests/google/registry/export/SyncGroupMembersActionTest.java b/javatests/google/registry/export/SyncGroupMembersActionTest.java index 86238f77b..ff574113b 100644 --- a/javatests/google/registry/export/SyncGroupMembersActionTest.java +++ b/javatests/google/registry/export/SyncGroupMembersActionTest.java @@ -29,7 +29,6 @@ import static org.mockito.Mockito.when; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; - import google.registry.groups.DirectoryGroupsConnection; import google.registry.groups.GroupsConnection.Role; import google.registry.model.registrar.Registrar; @@ -38,15 +37,13 @@ import google.registry.request.Response; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.InjectRule; - +import java.io.IOException; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import java.io.IOException; - /** * Unit tests for {@link SyncGroupMembersAction}. * diff --git a/javatests/google/registry/export/UpdateSnapshotViewActionTest.java b/javatests/google/registry/export/UpdateSnapshotViewActionTest.java index a98c0aed7..5ab9146c5 100644 --- a/javatests/google/registry/export/UpdateSnapshotViewActionTest.java +++ b/javatests/google/registry/export/UpdateSnapshotViewActionTest.java @@ -29,13 +29,12 @@ import com.google.api.services.bigquery.Bigquery; import com.google.api.services.bigquery.model.Dataset; import com.google.api.services.bigquery.model.Table; import com.google.appengine.api.taskqueue.QueueFactory; - import google.registry.bigquery.BigqueryFactory; import google.registry.request.HttpException.InternalServerErrorException; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.TaskQueueHelper.TaskMatcher; - +import java.io.IOException; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -44,8 +43,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import java.io.IOException; - /** Unit tests for {@link UpdateSnapshotViewAction}. */ @RunWith(MockitoJUnitRunner.class) public class UpdateSnapshotViewActionTest { diff --git a/javatests/google/registry/export/sheet/SheetSynchronizerTest.java b/javatests/google/registry/export/sheet/SheetSynchronizerTest.java index cae9b9407..7df9dba7d 100644 --- a/javatests/google/registry/export/sheet/SheetSynchronizerTest.java +++ b/javatests/google/registry/export/sheet/SheetSynchronizerTest.java @@ -30,15 +30,13 @@ import com.google.gdata.data.spreadsheet.ListEntry; import com.google.gdata.data.spreadsheet.ListFeed; import com.google.gdata.data.spreadsheet.SpreadsheetEntry; import com.google.gdata.data.spreadsheet.WorksheetEntry; - +import java.net.URL; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.net.URL; - /** Unit tests for {@link SheetSynchronizer}. */ @RunWith(JUnit4.class) public class SheetSynchronizerTest { diff --git a/javatests/google/registry/export/sheet/SyncRegistrarsSheetActionTest.java b/javatests/google/registry/export/sheet/SyncRegistrarsSheetActionTest.java index 6d6ff6928..b4486e993 100644 --- a/javatests/google/registry/export/sheet/SyncRegistrarsSheetActionTest.java +++ b/javatests/google/registry/export/sheet/SyncRegistrarsSheetActionTest.java @@ -25,21 +25,17 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import com.google.common.base.Optional; - import google.registry.model.server.Lock; import google.registry.testing.AppEngineRule; import google.registry.testing.FakeResponse; - +import java.util.concurrent.Callable; +import javax.annotation.Nullable; import org.joda.time.Duration; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.concurrent.Callable; - -import javax.annotation.Nullable; - /** Unit tests for {@link SyncRegistrarsSheetAction}. */ @RunWith(JUnit4.class) public class SyncRegistrarsSheetActionTest { diff --git a/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java b/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java index ea014e43d..53bfcb90f 100644 --- a/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java +++ b/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java @@ -28,7 +28,6 @@ import static org.mockito.Mockito.verify; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import google.registry.config.RegistryEnvironment; import google.registry.model.ofy.Ofy; import google.registry.model.registrar.Registrar; @@ -37,7 +36,6 @@ import google.registry.model.registrar.RegistrarContact; import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; - import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Before; diff --git a/javatests/google/registry/flows/CheckApiActionTest.java b/javatests/google/registry/flows/CheckApiActionTest.java index 219cb0492..82c67bf86 100644 --- a/javatests/google/registry/flows/CheckApiActionTest.java +++ b/javatests/google/registry/flows/CheckApiActionTest.java @@ -21,7 +21,6 @@ import static google.registry.testing.DatastoreHelper.persistReservedList; import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.collect.ImmutableSet; - import google.registry.config.RegistryEnvironment; import google.registry.flows.EppTestComponent.FakesAndMocksModule; import google.registry.model.registrar.Registrar; @@ -29,7 +28,7 @@ import google.registry.model.registry.Registry; import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; - +import java.util.Map; import org.json.simple.JSONValue; import org.junit.Before; import org.junit.Rule; @@ -37,8 +36,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.Map; - /** Tests for {@link CheckApiAction}. */ @RunWith(JUnit4.class) public class CheckApiActionTest { diff --git a/javatests/google/registry/flows/EppCommitLogsTest.java b/javatests/google/registry/flows/EppCommitLogsTest.java index a932403e9..31a1f1c67 100644 --- a/javatests/google/registry/flows/EppCommitLogsTest.java +++ b/javatests/google/registry/flows/EppCommitLogsTest.java @@ -25,7 +25,6 @@ import static org.joda.time.DateTimeZone.UTC; import static org.joda.time.Duration.standardDays; import com.googlecode.objectify.Key; - import google.registry.flows.EppTestComponent.FakesAndMocksModule; import google.registry.model.domain.DomainResource; import google.registry.model.ofy.Ofy; @@ -36,7 +35,6 @@ import google.registry.testing.FakeClock; import google.registry.testing.FakeHttpSession; import google.registry.testing.InjectRule; import google.registry.testing.ShardableTestCase; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/flows/EppConsoleActionTest.java b/javatests/google/registry/flows/EppConsoleActionTest.java index 3039a5296..71f85c010 100644 --- a/javatests/google/registry/flows/EppConsoleActionTest.java +++ b/javatests/google/registry/flows/EppConsoleActionTest.java @@ -25,7 +25,6 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.FakeHttpSession; import google.registry.testing.ShardableTestCase; import google.registry.testing.UserInfo; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/flows/EppControllerTest.java b/javatests/google/registry/flows/EppControllerTest.java index ef75953bf..f8026d0ad 100644 --- a/javatests/google/registry/flows/EppControllerTest.java +++ b/javatests/google/registry/flows/EppControllerTest.java @@ -23,7 +23,6 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.ShardableTestCase; import google.registry.util.SystemClock; import google.registry.xml.ValidationMode; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/flows/EppLifecycleContactTest.java b/javatests/google/registry/flows/EppLifecycleContactTest.java index 1583ff578..05f936d52 100644 --- a/javatests/google/registry/flows/EppLifecycleContactTest.java +++ b/javatests/google/registry/flows/EppLifecycleContactTest.java @@ -15,9 +15,7 @@ package google.registry.flows; import com.google.common.collect.ImmutableMap; - import google.registry.testing.AppEngineRule; - import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/flows/EppLifecycleDomainApplicationTest.java b/javatests/google/registry/flows/EppLifecycleDomainApplicationTest.java index 34d263751..25b05267e 100644 --- a/javatests/google/registry/flows/EppLifecycleDomainApplicationTest.java +++ b/javatests/google/registry/flows/EppLifecycleDomainApplicationTest.java @@ -18,11 +18,9 @@ import static google.registry.testing.DatastoreHelper.createTld; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedMap; - import google.registry.model.registry.Registry.TldState; import google.registry.testing.AppEngineRule; import google.registry.util.DateTimeUtils; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/flows/EppLifecycleDomainTest.java b/javatests/google/registry/flows/EppLifecycleDomainTest.java index a9e0190b9..50be3b506 100644 --- a/javatests/google/registry/flows/EppLifecycleDomainTest.java +++ b/javatests/google/registry/flows/EppLifecycleDomainTest.java @@ -22,10 +22,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedMap; import com.google.re2j.Matcher; import com.google.re2j.Pattern; - import google.registry.model.registry.Registry.TldState; import google.registry.testing.AppEngineRule; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/flows/EppLifecycleHostTest.java b/javatests/google/registry/flows/EppLifecycleHostTest.java index daa1b9f8c..ebd4b628d 100644 --- a/javatests/google/registry/flows/EppLifecycleHostTest.java +++ b/javatests/google/registry/flows/EppLifecycleHostTest.java @@ -15,7 +15,6 @@ package google.registry.flows; import google.registry.testing.AppEngineRule; - import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/flows/EppLoggedOutTest.java b/javatests/google/registry/flows/EppLoggedOutTest.java index f8a9f0689..9e0f607d9 100644 --- a/javatests/google/registry/flows/EppLoggedOutTest.java +++ b/javatests/google/registry/flows/EppLoggedOutTest.java @@ -18,9 +18,7 @@ import static org.joda.time.DateTimeZone.UTC; import static org.joda.time.format.ISODateTimeFormat.dateTimeNoMillis; import com.google.common.collect.ImmutableMap; - import google.registry.testing.AppEngineRule; - import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/flows/EppLoginAdminUserTest.java b/javatests/google/registry/flows/EppLoginAdminUserTest.java index 95c824749..b7bc34a41 100644 --- a/javatests/google/registry/flows/EppLoginAdminUserTest.java +++ b/javatests/google/registry/flows/EppLoginAdminUserTest.java @@ -18,7 +18,6 @@ import static com.google.appengine.api.users.UserServiceFactory.getUserService; import google.registry.testing.AppEngineRule; import google.registry.testing.UserInfo; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/flows/EppLoginTlsTest.java b/javatests/google/registry/flows/EppLoginTlsTest.java index c936d04a6..c2eb7b059 100644 --- a/javatests/google/registry/flows/EppLoginTlsTest.java +++ b/javatests/google/registry/flows/EppLoginTlsTest.java @@ -18,11 +18,9 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.DateTimeZone.UTC; import com.google.common.base.Optional; - import google.registry.model.registrar.Registrar; import google.registry.testing.AppEngineRule; import google.registry.testing.CertificateSamples; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/flows/EppLoginUserTest.java b/javatests/google/registry/flows/EppLoginUserTest.java index 031d7ea4d..c10a0043b 100644 --- a/javatests/google/registry/flows/EppLoginUserTest.java +++ b/javatests/google/registry/flows/EppLoginUserTest.java @@ -19,12 +19,10 @@ import static google.registry.testing.DatastoreHelper.persistResource; import com.google.appengine.api.users.User; import com.google.common.collect.ImmutableSet; - import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; import google.registry.testing.AppEngineRule; import google.registry.testing.UserInfo; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/flows/EppTestCase.java b/javatests/google/registry/flows/EppTestCase.java index aafa6c902..1f0885607 100644 --- a/javatests/google/registry/flows/EppTestCase.java +++ b/javatests/google/registry/flows/EppTestCase.java @@ -23,7 +23,6 @@ import static javax.servlet.http.HttpServletResponse.SC_OK; import static org.joda.time.DateTimeZone.UTC; import com.google.common.net.MediaType; - import google.registry.flows.EppTestComponent.FakesAndMocksModule; import google.registry.model.ofy.Ofy; import google.registry.testing.FakeClock; @@ -31,13 +30,11 @@ import google.registry.testing.FakeHttpSession; import google.registry.testing.FakeResponse; import google.registry.testing.InjectRule; import google.registry.testing.ShardableTestCase; - +import java.util.Map; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; -import java.util.Map; - public class EppTestCase extends ShardableTestCase { private static final MediaType APPLICATION_EPP_XML_UTF8 = diff --git a/javatests/google/registry/flows/EppTestComponent.java b/javatests/google/registry/flows/EppTestComponent.java index 5d319735f..5641955c2 100644 --- a/javatests/google/registry/flows/EppTestComponent.java +++ b/javatests/google/registry/flows/EppTestComponent.java @@ -20,12 +20,10 @@ import dagger.Component; import dagger.Module; import dagger.Provides; import dagger.Subcomponent; - import google.registry.monitoring.whitebox.EppMetrics; import google.registry.request.RequestScope; import google.registry.testing.FakeClock; import google.registry.util.Clock; - import javax.inject.Singleton; /** Dagger component for running EPP tests. */ diff --git a/javatests/google/registry/flows/EppTlsActionTest.java b/javatests/google/registry/flows/EppTlsActionTest.java index a965622d5..fcaa76647 100644 --- a/javatests/google/registry/flows/EppTlsActionTest.java +++ b/javatests/google/registry/flows/EppTlsActionTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.when; import google.registry.testing.FakeHttpSession; import google.registry.testing.ShardableTestCase; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/javatests/google/registry/flows/EppXmlTransformerTest.java b/javatests/google/registry/flows/EppXmlTransformerTest.java index 4baf08080..0ee82a09e 100644 --- a/javatests/google/registry/flows/EppXmlTransformerTest.java +++ b/javatests/google/registry/flows/EppXmlTransformerTest.java @@ -23,7 +23,6 @@ import google.registry.model.eppinput.EppInput; import google.registry.model.eppoutput.EppOutput; import google.registry.testing.ExceptionRule; import google.registry.testing.ShardableTestCase; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/flows/EppXxeAttackTest.java b/javatests/google/registry/flows/EppXxeAttackTest.java index 608b5142f..7c3747746 100644 --- a/javatests/google/registry/flows/EppXxeAttackTest.java +++ b/javatests/google/registry/flows/EppXxeAttackTest.java @@ -15,7 +15,6 @@ package google.registry.flows; import google.registry.testing.AppEngineRule; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/flows/FlowRunnerTest.java b/javatests/google/registry/flows/FlowRunnerTest.java index 181bfcb8f..c75395e7f 100644 --- a/javatests/google/registry/flows/FlowRunnerTest.java +++ b/javatests/google/registry/flows/FlowRunnerTest.java @@ -29,7 +29,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.testing.TestLogHandler; - import google.registry.model.eppcommon.Trid; import google.registry.model.eppinput.EppInput; import google.registry.model.eppoutput.EppOutput; @@ -39,7 +38,10 @@ import google.registry.testing.FakeClock; import google.registry.testing.FakeHttpSession; import google.registry.testing.Providers; import google.registry.testing.ShardableTestCase; - +import java.util.List; +import java.util.Map; +import java.util.logging.LogRecord; +import java.util.logging.Logger; import org.json.simple.JSONValue; import org.junit.Before; import org.junit.Rule; @@ -47,11 +49,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.List; -import java.util.Map; -import java.util.logging.LogRecord; -import java.util.logging.Logger; - /** Unit tests for {@link FlowRunner}. */ @RunWith(JUnit4.class) public class FlowRunnerTest extends ShardableTestCase { diff --git a/javatests/google/registry/flows/FlowTestCase.java b/javatests/google/registry/flows/FlowTestCase.java index a0f7ffb79..c9cb8a64a 100644 --- a/javatests/google/registry/flows/FlowTestCase.java +++ b/javatests/google/registry/flows/FlowTestCase.java @@ -33,7 +33,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; - import google.registry.flows.EppTestComponent.FakesAndMocksModule; import google.registry.flows.picker.FlowPicker; import google.registry.model.billing.BillingEvent; @@ -53,16 +52,14 @@ import google.registry.testing.InjectRule; import google.registry.testing.ShardableTestCase; import google.registry.util.TypeUtils.TypeInstantiator; import google.registry.xml.ValidationMode; - +import java.util.List; +import java.util.Map; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; -import java.util.List; -import java.util.Map; - /** * Base class for resource flow unit tests. * diff --git a/javatests/google/registry/flows/ResourceFlowTestCase.java b/javatests/google/registry/flows/ResourceFlowTestCase.java index 5bc14eab2..d999e16fe 100644 --- a/javatests/google/registry/flows/ResourceFlowTestCase.java +++ b/javatests/google/registry/flows/ResourceFlowTestCase.java @@ -23,9 +23,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import com.googlecode.objectify.Key; - import google.registry.flows.EppException.CommandUseErrorException; import google.registry.model.EppResource; import google.registry.model.domain.launch.ApplicationIdTargetExtension; @@ -37,7 +35,6 @@ import google.registry.model.tmch.ClaimsListShard.ClaimsListRevision; import google.registry.model.tmch.ClaimsListShard.ClaimsListSingleton; import google.registry.testing.ExceptionRule; import google.registry.util.TypeUtils.TypeInstantiator; - import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/flows/async/DeleteContactResourceActionTest.java b/javatests/google/registry/flows/async/DeleteContactResourceActionTest.java index b076f15cb..d1f5ac478 100644 --- a/javatests/google/registry/flows/async/DeleteContactResourceActionTest.java +++ b/javatests/google/registry/flows/async/DeleteContactResourceActionTest.java @@ -31,10 +31,8 @@ import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.model.contact.ContactAddress; import google.registry.model.contact.ContactPhoneNumber; import google.registry.model.contact.ContactResource; @@ -48,7 +46,6 @@ import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferResponse; import google.registry.model.transfer.TransferStatus; import google.registry.request.HttpException.BadRequestException; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/flows/async/DeleteEppResourceActionTestCase.java b/javatests/google/registry/flows/async/DeleteEppResourceActionTestCase.java index 6a0de8984..ababd3378 100644 --- a/javatests/google/registry/flows/async/DeleteEppResourceActionTestCase.java +++ b/javatests/google/registry/flows/async/DeleteEppResourceActionTestCase.java @@ -27,10 +27,8 @@ import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.mapreduce.MapreduceRunner; import google.registry.model.contact.ContactResource; import google.registry.model.domain.DomainResource; @@ -46,7 +44,6 @@ import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; import google.registry.testing.InjectRule; import google.registry.testing.mapreduce.MapreduceTestCase; - import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Rule; diff --git a/javatests/google/registry/flows/async/DeleteHostResourceActionTest.java b/javatests/google/registry/flows/async/DeleteHostResourceActionTest.java index 1e5523f7c..1636b6b40 100644 --- a/javatests/google/registry/flows/async/DeleteHostResourceActionTest.java +++ b/javatests/google/registry/flows/async/DeleteHostResourceActionTest.java @@ -28,16 +28,13 @@ import static google.registry.testing.TaskQueueHelper.assertDnsTasksEnqueued; import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.model.domain.DomainResource; import google.registry.model.eppcommon.StatusValue; import google.registry.model.host.HostResource; import google.registry.model.reporting.HistoryEntry; import google.registry.request.HttpException.BadRequestException; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/flows/async/DnsRefreshForHostRenameActionTest.java b/javatests/google/registry/flows/async/DnsRefreshForHostRenameActionTest.java index 49f9b4014..454886a83 100644 --- a/javatests/google/registry/flows/async/DnsRefreshForHostRenameActionTest.java +++ b/javatests/google/registry/flows/async/DnsRefreshForHostRenameActionTest.java @@ -28,10 +28,8 @@ import static org.mockito.Mockito.verifyZeroInteractions; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.dns.DnsQueue; import google.registry.mapreduce.MapreduceRunner; import google.registry.model.host.HostResource; @@ -40,7 +38,6 @@ import google.registry.testing.ExceptionRule; import google.registry.testing.FakeResponse; import google.registry.testing.InjectRule; import google.registry.testing.mapreduce.MapreduceTestCase; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/flows/contact/ContactCheckFlowTest.java b/javatests/google/registry/flows/contact/ContactCheckFlowTest.java index 1d5a97296..f028f6478 100644 --- a/javatests/google/registry/flows/contact/ContactCheckFlowTest.java +++ b/javatests/google/registry/flows/contact/ContactCheckFlowTest.java @@ -21,7 +21,6 @@ import static google.registry.testing.DatastoreHelper.persistDeletedContact; import google.registry.flows.ResourceCheckFlow.TooManyResourceChecksException; import google.registry.flows.ResourceCheckFlowTestCase; import google.registry.model.contact.ContactResource; - import org.junit.Test; /** Unit tests for {@link ContactCheckFlow}. */ diff --git a/javatests/google/registry/flows/contact/ContactCreateFlowTest.java b/javatests/google/registry/flows/contact/ContactCreateFlowTest.java index f25902ac8..463d8e4f6 100644 --- a/javatests/google/registry/flows/contact/ContactCreateFlowTest.java +++ b/javatests/google/registry/flows/contact/ContactCreateFlowTest.java @@ -24,7 +24,6 @@ import google.registry.flows.ResourceFlowTestCase; import google.registry.flows.contact.ContactFlowUtils.BadInternationalizedPostalInfoException; import google.registry.flows.contact.ContactFlowUtils.DeclineContactDisclosureFieldDisallowedPolicyException; import google.registry.model.contact.ContactResource; - import org.joda.time.DateTime; import org.junit.Test; diff --git a/javatests/google/registry/flows/contact/ContactDeleteFlowTest.java b/javatests/google/registry/flows/contact/ContactDeleteFlowTest.java index dc5cdac17..2a03454c0 100644 --- a/javatests/google/registry/flows/contact/ContactDeleteFlowTest.java +++ b/javatests/google/registry/flows/contact/ContactDeleteFlowTest.java @@ -27,9 +27,7 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; - import google.registry.flows.ResourceAsyncDeleteFlow.ResourceToDeleteIsReferencedException; import google.registry.flows.ResourceFlowTestCase; import google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException; @@ -41,7 +39,6 @@ import google.registry.model.contact.ContactResource; import google.registry.model.eppcommon.StatusValue; import google.registry.model.reporting.HistoryEntry; import google.registry.testing.TaskQueueHelper.TaskMatcher; - import org.joda.time.Duration; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/flows/contact/ContactInfoFlowTest.java b/javatests/google/registry/flows/contact/ContactInfoFlowTest.java index 47ad1d137..9c130fa42 100644 --- a/javatests/google/registry/flows/contact/ContactInfoFlowTest.java +++ b/javatests/google/registry/flows/contact/ContactInfoFlowTest.java @@ -23,7 +23,6 @@ import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import google.registry.flows.ResourceFlowTestCase; import google.registry.flows.ResourceQueryFlow.ResourceToQueryDoesNotExistException; import google.registry.model.contact.ContactAddress; @@ -36,7 +35,6 @@ import google.registry.model.contact.PostalInfo.Type; import google.registry.model.eppcommon.AuthInfo.PasswordAuth; import google.registry.model.eppcommon.PresenceMarker; import google.registry.model.eppcommon.StatusValue; - import org.joda.time.DateTime; import org.junit.Test; diff --git a/javatests/google/registry/flows/contact/ContactTransferApproveFlowTest.java b/javatests/google/registry/flows/contact/ContactTransferApproveFlowTest.java index a5824b1bd..964a574f0 100644 --- a/javatests/google/registry/flows/contact/ContactTransferApproveFlowTest.java +++ b/javatests/google/registry/flows/contact/ContactTransferApproveFlowTest.java @@ -25,7 +25,6 @@ import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.collect.FluentIterable; import com.google.common.collect.Iterables; - import google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException; import google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException; import google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException; @@ -39,7 +38,6 @@ import google.registry.model.poll.PollMessage; import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferResponse; import google.registry.model.transfer.TransferStatus; - import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/flows/contact/ContactTransferCancelFlowTest.java b/javatests/google/registry/flows/contact/ContactTransferCancelFlowTest.java index 8f7197588..aad737471 100644 --- a/javatests/google/registry/flows/contact/ContactTransferCancelFlowTest.java +++ b/javatests/google/registry/flows/contact/ContactTransferCancelFlowTest.java @@ -24,7 +24,6 @@ import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.collect.FluentIterable; import com.google.common.collect.Iterables; - import google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException; import google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException; import google.registry.flows.ResourceMutatePendingTransferFlow.NotPendingTransferException; @@ -36,7 +35,6 @@ import google.registry.model.poll.PollMessage; import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferResponse; import google.registry.model.transfer.TransferStatus; - import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/flows/contact/ContactTransferFlowTestCase.java b/javatests/google/registry/flows/contact/ContactTransferFlowTestCase.java index 12904f5b6..27e7cc4db 100644 --- a/javatests/google/registry/flows/contact/ContactTransferFlowTestCase.java +++ b/javatests/google/registry/flows/contact/ContactTransferFlowTestCase.java @@ -26,7 +26,6 @@ import google.registry.model.contact.ContactResource; import google.registry.model.registry.Registry; import google.registry.model.transfer.TransferStatus; import google.registry.testing.AppEngineRule; - import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Before; diff --git a/javatests/google/registry/flows/contact/ContactTransferQueryFlowTest.java b/javatests/google/registry/flows/contact/ContactTransferQueryFlowTest.java index 948badd98..d3f28b77d 100644 --- a/javatests/google/registry/flows/contact/ContactTransferQueryFlowTest.java +++ b/javatests/google/registry/flows/contact/ContactTransferQueryFlowTest.java @@ -28,7 +28,6 @@ import google.registry.model.contact.ContactResource; import google.registry.model.eppcommon.AuthInfo.PasswordAuth; import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferStatus; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/flows/contact/ContactTransferRejectFlowTest.java b/javatests/google/registry/flows/contact/ContactTransferRejectFlowTest.java index 1f7736039..d34f79354 100644 --- a/javatests/google/registry/flows/contact/ContactTransferRejectFlowTest.java +++ b/javatests/google/registry/flows/contact/ContactTransferRejectFlowTest.java @@ -24,7 +24,6 @@ import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.collect.FluentIterable; import com.google.common.collect.Iterables; - import google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException; import google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException; import google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException; @@ -38,7 +37,6 @@ import google.registry.model.poll.PollMessage; import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferResponse; import google.registry.model.transfer.TransferStatus; - import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/flows/contact/ContactTransferRequestFlowTest.java b/javatests/google/registry/flows/contact/ContactTransferRequestFlowTest.java index 3f2418878..3b5e80777 100644 --- a/javatests/google/registry/flows/contact/ContactTransferRequestFlowTest.java +++ b/javatests/google/registry/flows/contact/ContactTransferRequestFlowTest.java @@ -33,7 +33,6 @@ import google.registry.model.contact.ContactResource; import google.registry.model.eppcommon.AuthInfo.PasswordAuth; import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferStatus; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/flows/contact/ContactUpdateFlowTest.java b/javatests/google/registry/flows/contact/ContactUpdateFlowTest.java index 0c874b4ea..764a2e005 100644 --- a/javatests/google/registry/flows/contact/ContactUpdateFlowTest.java +++ b/javatests/google/registry/flows/contact/ContactUpdateFlowTest.java @@ -23,7 +23,6 @@ import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import google.registry.flows.ResourceFlowTestCase; import google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException; import google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException; @@ -37,7 +36,6 @@ import google.registry.model.contact.ContactResource; import google.registry.model.contact.PostalInfo; import google.registry.model.contact.PostalInfo.Type; import google.registry.model.eppcommon.StatusValue; - import org.junit.Test; /** Unit tests for {@link ContactUpdateFlow}. */ diff --git a/javatests/google/registry/flows/domain/ClaimsCheckFlowTest.java b/javatests/google/registry/flows/domain/ClaimsCheckFlowTest.java index 2ed7af4b7..822dc2de4 100644 --- a/javatests/google/registry/flows/domain/ClaimsCheckFlowTest.java +++ b/javatests/google/registry/flows/domain/ClaimsCheckFlowTest.java @@ -20,7 +20,6 @@ import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import google.registry.flows.ResourceCheckFlow.TooManyResourceChecksException; import google.registry.flows.ResourceFlow.BadCommandForRegistryPhaseException; import google.registry.flows.ResourceFlowTestCase; @@ -31,7 +30,6 @@ import google.registry.model.registrar.Registrar; import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.TldState; import google.registry.testing.DatastoreHelper; - import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/flows/domain/DomainAllocateFlowTest.java b/javatests/google/registry/flows/domain/DomainAllocateFlowTest.java index fc659d656..9e641d547 100644 --- a/javatests/google/registry/flows/domain/DomainAllocateFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainAllocateFlowTest.java @@ -39,9 +39,7 @@ import static org.joda.money.CurrencyUnit.USD; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Ref; - import google.registry.flows.ResourceCreateFlow.ResourceAlreadyExistsException; import google.registry.flows.ResourceFlowTestCase; import google.registry.flows.domain.DomainAllocateFlow.HasFinalStatusException; @@ -72,7 +70,6 @@ import google.registry.model.reporting.HistoryEntry; import google.registry.model.smd.EncodedSignedMark; import google.registry.testing.DatastoreHelper; import google.registry.testing.TaskQueueHelper.TaskMatcher; - import org.joda.money.Money; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/javatests/google/registry/flows/domain/DomainApplicationCreateFlowTest.java b/javatests/google/registry/flows/domain/DomainApplicationCreateFlowTest.java index 1fb2ac3f8..49b5f653d 100644 --- a/javatests/google/registry/flows/domain/DomainApplicationCreateFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainApplicationCreateFlowTest.java @@ -39,7 +39,6 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; - import google.registry.flows.EppException.UnimplementedExtensionException; import google.registry.flows.ResourceCreateFlow.ResourceAlreadyExistsException; import google.registry.flows.ResourceFlow.BadCommandForRegistryPhaseException; @@ -114,7 +113,9 @@ import google.registry.model.smd.SignedMarkRevocationList; import google.registry.testing.DatastoreHelper; import google.registry.testing.RegistryConfigRule; import google.registry.tmch.TmchCertificateAuthority; - +import java.util.Collections; +import java.util.Comparator; +import java.util.List; import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.joda.time.DateTime; @@ -123,10 +124,6 @@ import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - /** Unit tests for {@link DomainApplicationCreateFlow}. */ public class DomainApplicationCreateFlowTest extends ResourceFlowTestCase { diff --git a/javatests/google/registry/flows/domain/DomainApplicationDeleteFlowTest.java b/javatests/google/registry/flows/domain/DomainApplicationDeleteFlowTest.java index 789cdebf7..c04f064f1 100644 --- a/javatests/google/registry/flows/domain/DomainApplicationDeleteFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainApplicationDeleteFlowTest.java @@ -26,9 +26,7 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.testing.GenericEppResourceSubject.assertAboutEppResources; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Ref; - import google.registry.flows.EppException.UnimplementedExtensionException; import google.registry.flows.ResourceFlow.BadCommandForRegistryPhaseException; import google.registry.flows.ResourceFlowTestCase; @@ -46,7 +44,6 @@ import google.registry.model.eppcommon.StatusValue; import google.registry.model.host.HostResource; import google.registry.model.registrar.Registrar; import google.registry.model.registry.Registry.TldState; - import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/flows/domain/DomainApplicationInfoFlowTest.java b/javatests/google/registry/flows/domain/DomainApplicationInfoFlowTest.java index 30e16024b..134c5cd10 100644 --- a/javatests/google/registry/flows/domain/DomainApplicationInfoFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainApplicationInfoFlowTest.java @@ -25,9 +25,7 @@ import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Ref; - import google.registry.flows.ResourceFlowTestCase; import google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException; import google.registry.flows.ResourceQueryFlow.ResourceToQueryDoesNotExistException; @@ -50,7 +48,6 @@ import google.registry.model.registry.Registry.TldState; import google.registry.model.smd.EncodedSignedMark; import google.registry.testing.AppEngineRule; import google.registry.testing.EppLoader; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/flows/domain/DomainApplicationUpdateFlowTest.java b/javatests/google/registry/flows/domain/DomainApplicationUpdateFlowTest.java index 5d4e00976..dd26a9544 100644 --- a/javatests/google/registry/flows/domain/DomainApplicationUpdateFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainApplicationUpdateFlowTest.java @@ -29,9 +29,7 @@ import static google.registry.testing.DomainApplicationSubject.assertAboutApplic import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Ref; - import google.registry.flows.EppException.UnimplementedExtensionException; import google.registry.flows.ResourceFlowTestCase; import google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException; @@ -68,7 +66,6 @@ import google.registry.model.registrar.Registrar; import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.TldState; import google.registry.model.reporting.HistoryEntry; - import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/flows/domain/DomainCheckFlowTest.java b/javatests/google/registry/flows/domain/DomainCheckFlowTest.java index 426b6f92c..4a9272a6b 100644 --- a/javatests/google/registry/flows/domain/DomainCheckFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainCheckFlowTest.java @@ -29,7 +29,6 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; - import google.registry.flows.ResourceCheckFlow.TooManyResourceChecksException; import google.registry.flows.ResourceCheckFlowTestCase; import google.registry.flows.domain.DomainCheckFlow.OnlyCheckedNamesCanBeFeeCheckedException; @@ -57,7 +56,6 @@ import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.TldState; import google.registry.model.registry.label.ReservedList; import google.registry.testing.DatastoreHelper; - import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/javatests/google/registry/flows/domain/DomainCreateFlowTest.java b/javatests/google/registry/flows/domain/DomainCreateFlowTest.java index c2688acf0..d7467bcc3 100644 --- a/javatests/google/registry/flows/domain/DomainCreateFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainCreateFlowTest.java @@ -45,7 +45,6 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; - import google.registry.flows.EppException.UnimplementedExtensionException; import google.registry.flows.EppRequestSource; import google.registry.flows.LoggedInFlow.UndeclaredServiceExtensionException; @@ -112,7 +111,6 @@ import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.TldState; import google.registry.model.reporting.HistoryEntry; import google.registry.testing.DatastoreHelper; - import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/javatests/google/registry/flows/domain/DomainDeleteFlowTest.java b/javatests/google/registry/flows/domain/DomainDeleteFlowTest.java index 6db6685ef..fc8c65d86 100644 --- a/javatests/google/registry/flows/domain/DomainDeleteFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainDeleteFlowTest.java @@ -40,10 +40,8 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Iterables; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.flows.EppRequestSource; import google.registry.flows.ResourceCreateOrMutateFlow.OnlyToolCanPassMetadataException; import google.registry.flows.ResourceFlowTestCase; @@ -70,7 +68,6 @@ import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferData; import google.registry.model.transfer.TransferResponse; import google.registry.model.transfer.TransferStatus; - import org.joda.money.Money; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/javatests/google/registry/flows/domain/DomainInfoFlowTest.java b/javatests/google/registry/flows/domain/DomainInfoFlowTest.java index 74290fa58..a5545b159 100644 --- a/javatests/google/registry/flows/domain/DomainInfoFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainInfoFlowTest.java @@ -25,10 +25,8 @@ import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.flows.ResourceFlowTestCase; import google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException; import google.registry.flows.ResourceQueryFlow.ResourceToQueryDoesNotExistException; @@ -50,7 +48,6 @@ import google.registry.model.eppcommon.AuthInfo.PasswordAuth; import google.registry.model.eppcommon.StatusValue; import google.registry.model.host.HostResource; import google.registry.testing.AppEngineRule; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/flows/domain/DomainRenewFlowTest.java b/javatests/google/registry/flows/domain/DomainRenewFlowTest.java index 55b77e571..fef714f3e 100644 --- a/javatests/google/registry/flows/domain/DomainRenewFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainRenewFlowTest.java @@ -32,9 +32,7 @@ import static org.joda.money.CurrencyUnit.USD; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; - import com.googlecode.objectify.Ref; - import google.registry.flows.ResourceFlowTestCase; import google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException; import google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException; @@ -60,7 +58,6 @@ import google.registry.model.poll.PollMessage; import google.registry.model.registrar.Registrar; import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; - import org.joda.money.Money; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/javatests/google/registry/flows/domain/DomainRestoreRequestFlowTest.java b/javatests/google/registry/flows/domain/DomainRestoreRequestFlowTest.java index 27ce422ee..c1453f96b 100644 --- a/javatests/google/registry/flows/domain/DomainRestoreRequestFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainRestoreRequestFlowTest.java @@ -32,9 +32,7 @@ import static org.joda.money.CurrencyUnit.USD; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; - import com.googlecode.objectify.Key; - import google.registry.flows.EppException.UnimplementedExtensionException; import google.registry.flows.ResourceFlowTestCase; import google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException; @@ -60,7 +58,6 @@ import google.registry.model.poll.PollMessage; import google.registry.model.registrar.Registrar; import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; - import org.joda.money.Money; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/flows/domain/DomainTransferApproveFlowTest.java b/javatests/google/registry/flows/domain/DomainTransferApproveFlowTest.java index 01fb364af..fa404665d 100644 --- a/javatests/google/registry/flows/domain/DomainTransferApproveFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainTransferApproveFlowTest.java @@ -36,7 +36,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Iterables; import com.google.common.collect.Ordering; - import google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException; import google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException; import google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException; @@ -63,7 +62,6 @@ import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferResponse; import google.registry.model.transfer.TransferStatus; - import org.joda.money.Money; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/javatests/google/registry/flows/domain/DomainTransferCancelFlowTest.java b/javatests/google/registry/flows/domain/DomainTransferCancelFlowTest.java index dc8143e3c..b4121ea46 100644 --- a/javatests/google/registry/flows/domain/DomainTransferCancelFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainTransferCancelFlowTest.java @@ -26,7 +26,6 @@ import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException; import google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException; import google.registry.flows.ResourceMutatePendingTransferFlow.NotPendingTransferException; @@ -42,7 +41,6 @@ import google.registry.model.registrar.Registrar; import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferResponse.DomainTransferResponse; import google.registry.model.transfer.TransferStatus; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/flows/domain/DomainTransferFlowTestCase.java b/javatests/google/registry/flows/domain/DomainTransferFlowTestCase.java index 43aaae130..3043a9988 100644 --- a/javatests/google/registry/flows/domain/DomainTransferFlowTestCase.java +++ b/javatests/google/registry/flows/domain/DomainTransferFlowTestCase.java @@ -27,9 +27,7 @@ import static google.registry.testing.GenericEppResourceSubject.assertAboutEppRe import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Ref; - import google.registry.flows.Flow; import google.registry.flows.ResourceFlowTestCase; import google.registry.model.EppResource; @@ -52,7 +50,6 @@ import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferData; import google.registry.model.transfer.TransferStatus; import google.registry.testing.AppEngineRule; - import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Before; diff --git a/javatests/google/registry/flows/domain/DomainTransferQueryFlowTest.java b/javatests/google/registry/flows/domain/DomainTransferQueryFlowTest.java index 45b9ebaa4..412cf5735 100644 --- a/javatests/google/registry/flows/domain/DomainTransferQueryFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainTransferQueryFlowTest.java @@ -31,7 +31,6 @@ import google.registry.model.domain.DomainResource; import google.registry.model.eppcommon.AuthInfo.PasswordAuth; import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferStatus; - import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/flows/domain/DomainTransferRejectFlowTest.java b/javatests/google/registry/flows/domain/DomainTransferRejectFlowTest.java index f79cbf8e4..c38cbd6b2 100644 --- a/javatests/google/registry/flows/domain/DomainTransferRejectFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainTransferRejectFlowTest.java @@ -26,7 +26,6 @@ import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; - import google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException; import google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException; import google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException; @@ -44,7 +43,6 @@ import google.registry.model.registrar.Registrar; import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferResponse; import google.registry.model.transfer.TransferStatus; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/flows/domain/DomainTransferRequestFlowTest.java b/javatests/google/registry/flows/domain/DomainTransferRequestFlowTest.java index 14584b8f7..7b1920cdb 100644 --- a/javatests/google/registry/flows/domain/DomainTransferRequestFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainTransferRequestFlowTest.java @@ -37,7 +37,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Iterables; - import google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException; import google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException; import google.registry.flows.ResourceTransferRequestFlow.AlreadyPendingTransferException; @@ -71,7 +70,6 @@ import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferResponse; import google.registry.model.transfer.TransferStatus; - import org.joda.money.Money; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/javatests/google/registry/flows/domain/DomainUpdateFlowTest.java b/javatests/google/registry/flows/domain/DomainUpdateFlowTest.java index f172c93ad..64992a0a3 100644 --- a/javatests/google/registry/flows/domain/DomainUpdateFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainUpdateFlowTest.java @@ -37,10 +37,8 @@ import static org.joda.money.CurrencyUnit.USD; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.flows.EppException.UnimplementedExtensionException; import google.registry.flows.EppRequestSource; import google.registry.flows.ResourceCreateOrMutateFlow.OnlyToolCanPassMetadataException; @@ -80,7 +78,6 @@ import google.registry.model.host.HostResource; import google.registry.model.registrar.Registrar; import google.registry.model.registry.Registry; import google.registry.model.reporting.HistoryEntry; - import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/flows/host/HostCheckFlowTest.java b/javatests/google/registry/flows/host/HostCheckFlowTest.java index ac3b72ff9..c0f68ecd6 100644 --- a/javatests/google/registry/flows/host/HostCheckFlowTest.java +++ b/javatests/google/registry/flows/host/HostCheckFlowTest.java @@ -21,7 +21,6 @@ import static google.registry.testing.DatastoreHelper.persistDeletedHost; import google.registry.flows.ResourceCheckFlow.TooManyResourceChecksException; import google.registry.flows.ResourceCheckFlowTestCase; import google.registry.model.host.HostResource; - import org.junit.Test; /** Unit tests for {@link HostCheckFlow}. */ diff --git a/javatests/google/registry/flows/host/HostCreateFlowTest.java b/javatests/google/registry/flows/host/HostCreateFlowTest.java index ca259867d..a99361c2a 100644 --- a/javatests/google/registry/flows/host/HostCreateFlowTest.java +++ b/javatests/google/registry/flows/host/HostCreateFlowTest.java @@ -27,7 +27,6 @@ import static google.registry.testing.TaskQueueHelper.assertNoDnsTasksEnqueued; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; - import google.registry.flows.EppXmlTransformer.IpAddressVersionMismatchException; import google.registry.flows.ResourceCreateFlow.ResourceAlreadyExistsException; import google.registry.flows.ResourceFlowTestCase; @@ -39,7 +38,6 @@ import google.registry.flows.host.HostFlowUtils.InvalidHostNameException; import google.registry.flows.host.HostFlowUtils.SuperordinateDomainDoesNotExistException; import google.registry.model.host.HostResource; import google.registry.model.reporting.HistoryEntry; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/flows/host/HostDeleteFlowTest.java b/javatests/google/registry/flows/host/HostDeleteFlowTest.java index 25b49cf04..a5c5f99a3 100644 --- a/javatests/google/registry/flows/host/HostDeleteFlowTest.java +++ b/javatests/google/registry/flows/host/HostDeleteFlowTest.java @@ -29,10 +29,8 @@ import static google.registry.testing.TaskQueueHelper.assertNoDnsTasksEnqueued; import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.flows.ResourceAsyncDeleteFlow.ResourceToDeleteIsReferencedException; import google.registry.flows.ResourceFlowTestCase; import google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException; @@ -44,7 +42,6 @@ import google.registry.model.eppcommon.StatusValue; import google.registry.model.host.HostResource; import google.registry.model.reporting.HistoryEntry; import google.registry.testing.TaskQueueHelper.TaskMatcher; - import org.joda.time.Duration; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/flows/host/HostInfoFlowTest.java b/javatests/google/registry/flows/host/HostInfoFlowTest.java index d50b9b66c..5e668853a 100644 --- a/javatests/google/registry/flows/host/HostInfoFlowTest.java +++ b/javatests/google/registry/flows/host/HostInfoFlowTest.java @@ -23,21 +23,17 @@ import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; - import com.googlecode.objectify.Ref; - import google.registry.flows.ResourceFlowTestCase; import google.registry.flows.ResourceQueryFlow.ResourceToQueryDoesNotExistException; import google.registry.model.domain.DomainResource; import google.registry.model.eppcommon.StatusValue; import google.registry.model.host.HostResource; - +import javax.annotation.Nullable; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; -import javax.annotation.Nullable; - /** Unit tests for {@link HostInfoFlow}. */ public class HostInfoFlowTest extends ResourceFlowTestCase { diff --git a/javatests/google/registry/flows/host/HostUpdateFlowTest.java b/javatests/google/registry/flows/host/HostUpdateFlowTest.java index b424fdde3..3b6b5101f 100644 --- a/javatests/google/registry/flows/host/HostUpdateFlowTest.java +++ b/javatests/google/registry/flows/host/HostUpdateFlowTest.java @@ -38,10 +38,8 @@ import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.flows.EppRequestSource; import google.registry.flows.ResourceFlowTestCase; import google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException; @@ -64,15 +62,12 @@ import google.registry.model.host.HostResource; import google.registry.model.index.ForeignKeyIndex; import google.registry.model.reporting.HistoryEntry; import google.registry.testing.TaskQueueHelper.TaskMatcher; - +import java.net.InetAddress; +import javax.annotation.Nullable; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; -import java.net.InetAddress; - -import javax.annotation.Nullable; - /** Unit tests for {@link HostUpdateFlow}. */ public class HostUpdateFlowTest extends ResourceFlowTestCase { diff --git a/javatests/google/registry/flows/poll/PollAckFlowTest.java b/javatests/google/registry/flows/poll/PollAckFlowTest.java index 6d44b2f80..aa2a491bb 100644 --- a/javatests/google/registry/flows/poll/PollAckFlowTest.java +++ b/javatests/google/registry/flows/poll/PollAckFlowTest.java @@ -30,7 +30,6 @@ import google.registry.model.contact.ContactResource; import google.registry.model.domain.DomainResource; import google.registry.model.poll.PollMessage; import google.registry.testing.ExceptionRule; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/flows/poll/PollRequestFlowTest.java b/javatests/google/registry/flows/poll/PollRequestFlowTest.java index 3292631ae..43fa5f97c 100644 --- a/javatests/google/registry/flows/poll/PollRequestFlowTest.java +++ b/javatests/google/registry/flows/poll/PollRequestFlowTest.java @@ -22,7 +22,6 @@ import static google.registry.testing.DatastoreHelper.persistActiveHost; import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.collect.ImmutableList; - import google.registry.flows.FlowTestCase; import google.registry.flows.poll.PollRequestFlow.UnexpectedMessageIdException; import google.registry.model.contact.ContactResource; @@ -36,7 +35,6 @@ import google.registry.model.transfer.TransferResponse.ContactTransferResponse; import google.registry.model.transfer.TransferResponse.DomainTransferResponse; import google.registry.model.transfer.TransferStatus; import google.registry.testing.ExceptionRule; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/flows/session/HelloFlowTest.java b/javatests/google/registry/flows/session/HelloFlowTest.java index 057c195b7..9cdb751b1 100644 --- a/javatests/google/registry/flows/session/HelloFlowTest.java +++ b/javatests/google/registry/flows/session/HelloFlowTest.java @@ -18,9 +18,7 @@ import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import static org.joda.time.format.ISODateTimeFormat.dateTimeNoMillis; import com.google.common.collect.ImmutableMap; - import google.registry.flows.FlowTestCase; - import org.junit.Test; /** Unit tests for {@link HelloFlow}. */ diff --git a/javatests/google/registry/flows/session/LoginFlowTestCase.java b/javatests/google/registry/flows/session/LoginFlowTestCase.java index 07b2e66eb..1aeb84014 100644 --- a/javatests/google/registry/flows/session/LoginFlowTestCase.java +++ b/javatests/google/registry/flows/session/LoginFlowTestCase.java @@ -31,7 +31,6 @@ import google.registry.flows.session.LoginFlow.UnsupportedLanguageException; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.Registrar.State; import google.registry.testing.ExceptionRule; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/flows/session/LoginFlowViaConsoleTest.java b/javatests/google/registry/flows/session/LoginFlowViaConsoleTest.java index b5497013a..b2985e642 100644 --- a/javatests/google/registry/flows/session/LoginFlowViaConsoleTest.java +++ b/javatests/google/registry/flows/session/LoginFlowViaConsoleTest.java @@ -21,17 +21,14 @@ import static google.registry.testing.DatastoreHelper.persistResource; import com.google.apphosting.api.ApiProxy; import com.google.apphosting.api.ApiProxy.Environment; import com.google.common.collect.ImmutableSet; - import google.registry.flows.GaeUserCredentials; import google.registry.flows.GaeUserCredentials.BadGaeUserIdException; import google.registry.flows.GaeUserCredentials.UserNotLoggedInException; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; - -import org.junit.Test; - import java.util.HashMap; import java.util.Map; +import org.junit.Test; /** * Unit tests for {@link LoginFlow} when accessed via a web frontend diff --git a/javatests/google/registry/flows/session/LoginFlowViaTlsTest.java b/javatests/google/registry/flows/session/LoginFlowViaTlsTest.java index 75d4c401d..2be68554e 100644 --- a/javatests/google/registry/flows/session/LoginFlowViaTlsTest.java +++ b/javatests/google/registry/flows/session/LoginFlowViaTlsTest.java @@ -19,7 +19,6 @@ import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.net.InetAddresses; - import google.registry.flows.TlsCredentials; import google.registry.flows.TlsCredentials.BadRegistrarCertificateException; import google.registry.flows.TlsCredentials.BadRegistrarIpAddressException; @@ -28,7 +27,6 @@ import google.registry.flows.TlsCredentials.NoSniException; import google.registry.model.registrar.Registrar; import google.registry.testing.CertificateSamples; import google.registry.util.CidrAddressBlock; - import org.junit.Test; /** Unit tests for {@link LoginFlow} when accessed via a TLS transport. */ diff --git a/javatests/google/registry/flows/session/LogoutFlowTest.java b/javatests/google/registry/flows/session/LogoutFlowTest.java index e59000889..341355910 100644 --- a/javatests/google/registry/flows/session/LogoutFlowTest.java +++ b/javatests/google/registry/flows/session/LogoutFlowTest.java @@ -19,7 +19,6 @@ import static google.registry.testing.DatastoreHelper.createTld; import google.registry.flows.FlowTestCase; import google.registry.flows.LoggedInFlow.NotLoggedInException; import google.registry.testing.ExceptionRule; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/groups/DirectoryGroupsConnectionTest.java b/javatests/google/registry/groups/DirectoryGroupsConnectionTest.java index aa229ec8c..3772ea2b0 100644 --- a/javatests/google/registry/groups/DirectoryGroupsConnectionTest.java +++ b/javatests/google/registry/groups/DirectoryGroupsConnectionTest.java @@ -45,10 +45,10 @@ import com.google.api.services.groupssettings.Groupssettings; import com.google.api.services.groupssettings.model.Groups; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import google.registry.groups.GroupsConnection.Role; import google.registry.testing.ExceptionRule; - +import java.io.IOException; +import java.util.Set; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -56,9 +56,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import java.io.IOException; -import java.util.Set; - /** * Unit tests for {@link DirectoryGroupsConnection}. */ diff --git a/javatests/google/registry/mapreduce/inputs/ChildEntityInputTest.java b/javatests/google/registry/mapreduce/inputs/ChildEntityInputTest.java index c35525a77..81e3be79a 100644 --- a/javatests/google/registry/mapreduce/inputs/ChildEntityInputTest.java +++ b/javatests/google/registry/mapreduce/inputs/ChildEntityInputTest.java @@ -29,9 +29,7 @@ import static org.joda.money.CurrencyUnit.USD; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; - import google.registry.config.TestRegistryConfig; import google.registry.model.EppResource; import google.registry.model.ImmutableObject; @@ -44,15 +42,6 @@ import google.registry.model.reporting.HistoryEntry; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.RegistryConfigRule; - -import org.joda.money.Money; -import org.joda.time.DateTime; -import org.joda.time.DateTimeZone; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; @@ -60,6 +49,13 @@ import java.io.ObjectOutputStream; import java.util.HashSet; import java.util.NoSuchElementException; import java.util.Set; +import org.joda.money.Money; +import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** Tests {@link ChildEntityInput} */ @RunWith(JUnit4.class) diff --git a/javatests/google/registry/mapreduce/inputs/EppResourceInputsTest.java b/javatests/google/registry/mapreduce/inputs/EppResourceInputsTest.java index f96043e47..962b2a6cf 100644 --- a/javatests/google/registry/mapreduce/inputs/EppResourceInputsTest.java +++ b/javatests/google/registry/mapreduce/inputs/EppResourceInputsTest.java @@ -30,9 +30,7 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.testing.DatastoreHelper.persistSimpleResource; import com.google.appengine.tools.mapreduce.InputReader; - import com.googlecode.objectify.Key; - import google.registry.config.TestRegistryConfig; import google.registry.model.EppResource; import google.registry.model.contact.ContactResource; @@ -44,12 +42,6 @@ import google.registry.model.index.EppResourceIndex; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.RegistryConfigRule; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; @@ -57,6 +49,10 @@ import java.io.ObjectOutputStream; import java.util.HashSet; import java.util.NoSuchElementException; import java.util.Set; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** Tests {@link EppResourceInputs} */ @RunWith(JUnit4.class) diff --git a/javatests/google/registry/model/CreateAutoTimestampTest.java b/javatests/google/registry/model/CreateAutoTimestampTest.java index 8ea96cf8f..9aa8da238 100644 --- a/javatests/google/registry/model/CreateAutoTimestampTest.java +++ b/javatests/google/registry/model/CreateAutoTimestampTest.java @@ -22,10 +22,8 @@ import com.googlecode.objectify.ObjectifyService; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.Work; import com.googlecode.objectify.annotation.Entity; - import google.registry.model.common.CrossTldSingleton; import google.registry.testing.AppEngineRule; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/model/EntityClassesTest.java b/javatests/google/registry/model/EntityClassesTest.java index f4fa7d54b..d026c248b 100644 --- a/javatests/google/registry/model/EntityClassesTest.java +++ b/javatests/google/registry/model/EntityClassesTest.java @@ -22,16 +22,13 @@ import static google.registry.util.TypeUtils.hasAnnotation; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.Ordering; - import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.EntitySubclass; - +import java.util.Set; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.Set; - /** Unit tests for {@link EntityClasses}. */ @RunWith(JUnit4.class) public class EntityClassesTest { diff --git a/javatests/google/registry/model/EntityTestCase.java b/javatests/google/registry/model/EntityTestCase.java index e4e745f08..ef9bd8f84 100644 --- a/javatests/google/registry/model/EntityTestCase.java +++ b/javatests/google/registry/model/EntityTestCase.java @@ -24,25 +24,16 @@ import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; - import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Ignore; import com.googlecode.objectify.annotation.Parent; import com.googlecode.objectify.annotation.Serialize; import com.googlecode.objectify.cmd.Query; - import google.registry.model.ofy.Ofy; import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; import google.registry.util.CidrAddressBlock; - -import org.joda.time.DateTime; -import org.junit.Before; -import org.junit.Rule; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - import java.lang.reflect.Array; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -50,6 +41,11 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Collection; import java.util.Set; +import org.joda.time.DateTime; +import org.junit.Before; +import org.junit.Rule; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** Base class of all unit tests for entities which are persisted to Datastore via Objectify. */ @RunWith(JUnit4.class) diff --git a/javatests/google/registry/model/EppResourceUtilsTest.java b/javatests/google/registry/model/EppResourceUtilsTest.java index 095530c85..85793e66d 100644 --- a/javatests/google/registry/model/EppResourceUtilsTest.java +++ b/javatests/google/registry/model/EppResourceUtilsTest.java @@ -29,7 +29,6 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; - import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Before; diff --git a/javatests/google/registry/model/ImmutableObjectTest.java b/javatests/google/registry/model/ImmutableObjectTest.java index e7d501f51..307fc3a88 100644 --- a/javatests/google/registry/model/ImmutableObjectTest.java +++ b/javatests/google/registry/model/ImmutableObjectTest.java @@ -25,20 +25,17 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; - import google.registry.util.CidrAddressBlock; - -import org.joda.time.DateTime; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - import java.util.ArrayDeque; import java.util.Arrays; import java.util.Deque; import java.util.List; import java.util.Map; import java.util.Set; +import org.joda.time.DateTime; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** Unit tests for {@link ImmutableObject}. */ @RunWith(JUnit4.class) diff --git a/javatests/google/registry/model/ModelUtilsTest.java b/javatests/google/registry/model/ModelUtilsTest.java index d250157f3..4c5469ef2 100644 --- a/javatests/google/registry/model/ModelUtilsTest.java +++ b/javatests/google/registry/model/ModelUtilsTest.java @@ -17,21 +17,17 @@ package google.registry.model; import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableMap; - import com.googlecode.objectify.annotation.Id; - import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; - +import java.lang.reflect.Field; +import java.util.Map; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.lang.reflect.Field; -import java.util.Map; - /** Unit tests for {@link ModelUtils}. */ @RunWith(JUnit4.class) public class ModelUtilsTest { diff --git a/javatests/google/registry/model/RoidSuffixesTest.java b/javatests/google/registry/model/RoidSuffixesTest.java index ac4afacc8..7ef8e37d9 100644 --- a/javatests/google/registry/model/RoidSuffixesTest.java +++ b/javatests/google/registry/model/RoidSuffixesTest.java @@ -20,7 +20,6 @@ import static google.registry.testing.DatastoreHelper.newRegistry; import static google.registry.testing.DatastoreHelper.persistResource; import google.registry.testing.AppEngineRule; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/model/SchemaVersionTest.java b/javatests/google/registry/model/SchemaVersionTest.java index 051492dca..1e8f63244 100644 --- a/javatests/google/registry/model/SchemaVersionTest.java +++ b/javatests/google/registry/model/SchemaVersionTest.java @@ -18,9 +18,7 @@ import static com.google.common.truth.Truth.assert_; import static google.registry.util.ResourceUtils.readResourceUtf8; import com.google.common.base.Joiner; - import google.registry.testing.AppEngineRule; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/model/UpdateAutoTimestampTest.java b/javatests/google/registry/model/UpdateAutoTimestampTest.java index fe2954ea8..54bb6155f 100644 --- a/javatests/google/registry/model/UpdateAutoTimestampTest.java +++ b/javatests/google/registry/model/UpdateAutoTimestampTest.java @@ -21,10 +21,8 @@ import static org.joda.time.DateTimeZone.UTC; import com.googlecode.objectify.ObjectifyService; import com.googlecode.objectify.Work; import com.googlecode.objectify.annotation.Entity; - import google.registry.model.common.CrossTldSingleton; import google.registry.testing.AppEngineRule; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/model/billing/BillingEventTest.java b/javatests/google/registry/model/billing/BillingEventTest.java index 81d51ed55..b7ab8d244 100644 --- a/javatests/google/registry/model/billing/BillingEventTest.java +++ b/javatests/google/registry/model/billing/BillingEventTest.java @@ -24,10 +24,8 @@ import static org.joda.money.CurrencyUnit.USD; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.model.EntityTestCase; import google.registry.model.billing.BillingEvent.Flag; import google.registry.model.billing.BillingEvent.Reason; @@ -36,7 +34,6 @@ import google.registry.model.domain.GracePeriod; import google.registry.model.domain.rgp.GracePeriodStatus; import google.registry.model.reporting.HistoryEntry; import google.registry.testing.ExceptionRule; - import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/model/billing/RegistrarBillingEntryTest.java b/javatests/google/registry/model/billing/RegistrarBillingEntryTest.java index 347d2eb89..8f4228252 100644 --- a/javatests/google/registry/model/billing/RegistrarBillingEntryTest.java +++ b/javatests/google/registry/model/billing/RegistrarBillingEntryTest.java @@ -19,13 +19,10 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.money.CurrencyUnit.USD; import com.google.common.collect.ImmutableMap; - import com.googlecode.objectify.Key; - import google.registry.model.EntityTestCase; import google.registry.model.registrar.Registrar; import google.registry.testing.ExceptionRule; - import org.joda.money.CurrencyMismatchException; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/javatests/google/registry/model/billing/RegistrarBillingUtilsTest.java b/javatests/google/registry/model/billing/RegistrarBillingUtilsTest.java index dc8102cfb..24b48bce9 100644 --- a/javatests/google/registry/model/billing/RegistrarBillingUtilsTest.java +++ b/javatests/google/registry/model/billing/RegistrarBillingUtilsTest.java @@ -24,14 +24,13 @@ import static org.joda.money.CurrencyUnit.JPY; import static org.joda.money.CurrencyUnit.USD; import com.google.common.collect.ImmutableSortedMap; - import google.registry.model.ofy.Ofy; import google.registry.model.registrar.Registrar; import google.registry.model.registry.Registry; import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; - +import java.util.Map; import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.joda.time.DateTime; @@ -42,8 +41,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.Map; - /** Unit tests for {@link RegistrarBillingUtils}. */ @RunWith(JUnit4.class) public final class RegistrarBillingUtilsTest { diff --git a/javatests/google/registry/model/billing/RegistrarCreditBalanceTest.java b/javatests/google/registry/model/billing/RegistrarCreditBalanceTest.java index b56f0f5c8..886ac0c36 100644 --- a/javatests/google/registry/model/billing/RegistrarCreditBalanceTest.java +++ b/javatests/google/registry/model/billing/RegistrarCreditBalanceTest.java @@ -22,13 +22,12 @@ import static google.registry.util.DateTimeUtils.END_OF_TIME; import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.collect.ImmutableMap; - import google.registry.model.EntityTestCase; import google.registry.model.billing.RegistrarCredit.CreditType; import google.registry.model.billing.RegistrarCreditBalance.BalanceMap; import google.registry.model.registrar.Registrar; import google.registry.testing.ExceptionRule; - +import java.util.Map; import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.joda.time.DateTime; @@ -36,8 +35,6 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import java.util.Map; - /** Unit tests for {@link RegistrarCreditBalance}. */ public class RegistrarCreditBalanceTest extends EntityTestCase { diff --git a/javatests/google/registry/model/billing/RegistrarCreditTest.java b/javatests/google/registry/model/billing/RegistrarCreditTest.java index 0eeacf42f..3d3829647 100644 --- a/javatests/google/registry/model/billing/RegistrarCreditTest.java +++ b/javatests/google/registry/model/billing/RegistrarCreditTest.java @@ -27,7 +27,6 @@ import google.registry.model.billing.RegistrarCredit.CreditType; import google.registry.model.registrar.Registrar; import google.registry.model.registry.Registry; import google.registry.testing.ExceptionRule; - import org.joda.money.CurrencyUnit; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/model/common/CursorTest.java b/javatests/google/registry/model/common/CursorTest.java index 86dd79371..b8e047f5e 100644 --- a/javatests/google/registry/model/common/CursorTest.java +++ b/javatests/google/registry/model/common/CursorTest.java @@ -24,12 +24,10 @@ import static google.registry.testing.DatastoreHelper.persistActiveDomain; import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.googlecode.objectify.VoidWork; - import google.registry.model.EntityTestCase; import google.registry.model.domain.DomainResource; import google.registry.model.registry.Registry; import google.registry.testing.ExceptionRule; - import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/common/GaeUserIdConverterTest.java b/javatests/google/registry/model/common/GaeUserIdConverterTest.java index 12a93b252..d9b8adf12 100644 --- a/javatests/google/registry/model/common/GaeUserIdConverterTest.java +++ b/javatests/google/registry/model/common/GaeUserIdConverterTest.java @@ -18,9 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.model.ofy.ObjectifyService.ofy; import com.googlecode.objectify.VoidWork; - import google.registry.testing.AppEngineRule; - import org.junit.After; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/common/PersistedRangeLongTest.java b/javatests/google/registry/model/common/PersistedRangeLongTest.java index 26156f411..35b02de05 100644 --- a/javatests/google/registry/model/common/PersistedRangeLongTest.java +++ b/javatests/google/registry/model/common/PersistedRangeLongTest.java @@ -17,7 +17,6 @@ package google.registry.model.common; import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.Range; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/javatests/google/registry/model/common/TimeOfYearTest.java b/javatests/google/registry/model/common/TimeOfYearTest.java index 0f8439906..a8cec50be 100644 --- a/javatests/google/registry/model/common/TimeOfYearTest.java +++ b/javatests/google/registry/model/common/TimeOfYearTest.java @@ -20,9 +20,7 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Range; - import google.registry.testing.ExceptionRule; - import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/common/TimedTransitionPropertyTest.java b/javatests/google/registry/model/common/TimedTransitionPropertyTest.java index 19263253e..bc60e6bd4 100644 --- a/javatests/google/registry/model/common/TimedTransitionPropertyTest.java +++ b/javatests/google/registry/model/common/TimedTransitionPropertyTest.java @@ -22,9 +22,9 @@ import static org.joda.time.DateTimeZone.UTC; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSortedMap; - import google.registry.testing.ExceptionRule; - +import java.util.Map; +import java.util.Set; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; @@ -32,9 +32,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.Map; -import java.util.Set; - /** Unit tests for {@link TimedTransitionProperty}. */ @RunWith(JUnit4.class) public class TimedTransitionPropertyTest { diff --git a/javatests/google/registry/model/contact/ContactCommandTest.java b/javatests/google/registry/model/contact/ContactCommandTest.java index 905e4da50..89941073a 100644 --- a/javatests/google/registry/model/contact/ContactCommandTest.java +++ b/javatests/google/registry/model/contact/ContactCommandTest.java @@ -23,11 +23,9 @@ import static google.registry.xml.XmlTestUtils.assertXmlEquals; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableList; - import google.registry.model.contact.PostalInfo.Type; import google.registry.testing.AppEngineRule; import google.registry.testing.EppLoader; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/model/contact/ContactResourceTest.java b/javatests/google/registry/model/contact/ContactResourceTest.java index 67d61b085..1fdfe5b68 100644 --- a/javatests/google/registry/model/contact/ContactResourceTest.java +++ b/javatests/google/registry/model/contact/ContactResourceTest.java @@ -24,9 +24,7 @@ import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; - import google.registry.model.EntityTestCase; import google.registry.model.billing.BillingEvent; import google.registry.model.contact.Disclose.PostalInfoChoice; @@ -39,7 +37,6 @@ import google.registry.model.transfer.TransferData; import google.registry.model.transfer.TransferData.TransferServerApproveEntity; import google.registry.model.transfer.TransferStatus; import google.registry.testing.ExceptionRule; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/domain/DomainApplicationTest.java b/javatests/google/registry/model/domain/DomainApplicationTest.java index 9fa2f2b4f..47b7a4060 100644 --- a/javatests/google/registry/model/domain/DomainApplicationTest.java +++ b/javatests/google/registry/model/domain/DomainApplicationTest.java @@ -28,10 +28,8 @@ import static org.joda.money.CurrencyUnit.USD; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.model.EntityTestCase; import google.registry.model.billing.BillingEvent; import google.registry.model.domain.launch.ApplicationStatus; @@ -47,7 +45,6 @@ import google.registry.model.transfer.TransferData; import google.registry.model.transfer.TransferData.TransferServerApproveEntity; import google.registry.model.transfer.TransferStatus; import google.registry.testing.ExceptionRule; - import org.joda.money.Money; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/model/domain/DomainCommandTest.java b/javatests/google/registry/model/domain/DomainCommandTest.java index a41e9ae4d..3c49367cf 100644 --- a/javatests/google/registry/model/domain/DomainCommandTest.java +++ b/javatests/google/registry/model/domain/DomainCommandTest.java @@ -15,7 +15,6 @@ package google.registry.model.domain; import google.registry.model.ResourceCommandTestCase; - import org.junit.Test; /** Test xml roundtripping of commands. */ diff --git a/javatests/google/registry/model/domain/DomainResourceTest.java b/javatests/google/registry/model/domain/DomainResourceTest.java index f3601c7cf..ca6f4c92f 100644 --- a/javatests/google/registry/model/domain/DomainResourceTest.java +++ b/javatests/google/registry/model/domain/DomainResourceTest.java @@ -35,10 +35,8 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Iterables; import com.google.common.collect.Ordering; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.flows.EppXmlTransformer; import google.registry.model.EntityTestCase; import google.registry.model.billing.BillingEvent; @@ -64,15 +62,13 @@ import google.registry.model.transfer.TransferData.TransferServerApproveEntity; import google.registry.model.transfer.TransferStatus; import google.registry.testing.ExceptionRule; import google.registry.xml.ValidationMode; - +import java.util.List; import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import java.util.List; - /** Unit tests for {@link DomainResource}. */ public class DomainResourceTest extends EntityTestCase { diff --git a/javatests/google/registry/model/domain/GracePeriodTest.java b/javatests/google/registry/model/domain/GracePeriodTest.java index 3439aab15..00575c881 100644 --- a/javatests/google/registry/model/domain/GracePeriodTest.java +++ b/javatests/google/registry/model/domain/GracePeriodTest.java @@ -19,7 +19,6 @@ import static org.joda.time.DateTimeZone.UTC; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.model.billing.BillingEvent; import google.registry.model.billing.BillingEvent.Reason; import google.registry.model.billing.BillingEvent.Recurring; @@ -27,7 +26,6 @@ import google.registry.model.domain.rgp.GracePeriodStatus; import google.registry.model.reporting.HistoryEntry; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; - import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/javatests/google/registry/model/export/LogsExportCursorTest.java b/javatests/google/registry/model/export/LogsExportCursorTest.java index 7c5f6a57e..d36fabad0 100644 --- a/javatests/google/registry/model/export/LogsExportCursorTest.java +++ b/javatests/google/registry/model/export/LogsExportCursorTest.java @@ -21,10 +21,8 @@ import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Range; - import google.registry.model.EntityTestCase; import google.registry.model.common.PersistedRangeLong; - import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/model/host/HostCommandTest.java b/javatests/google/registry/model/host/HostCommandTest.java index cec24ec20..f02b08600 100644 --- a/javatests/google/registry/model/host/HostCommandTest.java +++ b/javatests/google/registry/model/host/HostCommandTest.java @@ -15,7 +15,6 @@ package google.registry.model.host; import google.registry.model.ResourceCommandTestCase; - import org.junit.Test; /** Test xml roundtripping of commands. */ diff --git a/javatests/google/registry/model/host/HostResourceTest.java b/javatests/google/registry/model/host/HostResourceTest.java index f483935ef..a3809b590 100644 --- a/javatests/google/registry/model/host/HostResourceTest.java +++ b/javatests/google/registry/model/host/HostResourceTest.java @@ -23,10 +23,8 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.testing.HostResourceSubject.assertAboutHosts; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.model.EntityTestCase; import google.registry.model.billing.BillingEvent; import google.registry.model.domain.DomainResource; @@ -37,17 +35,14 @@ import google.registry.model.transfer.TransferData; import google.registry.model.transfer.TransferData.TransferServerApproveEntity; import google.registry.model.transfer.TransferStatus; import google.registry.testing.ExceptionRule; - +import java.net.InetAddress; +import javax.annotation.Nullable; import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import java.net.InetAddress; - -import javax.annotation.Nullable; - /** Unit tests for {@link HostResource}. */ public class HostResourceTest extends EntityTestCase { diff --git a/javatests/google/registry/model/index/DomainApplicationIndexTest.java b/javatests/google/registry/model/index/DomainApplicationIndexTest.java index 2ed5c53d1..1536123e9 100644 --- a/javatests/google/registry/model/index/DomainApplicationIndexTest.java +++ b/javatests/google/registry/model/index/DomainApplicationIndexTest.java @@ -24,13 +24,10 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.testing.DatastoreHelper.persistSimpleResource; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Ref; - import google.registry.model.EntityTestCase; import google.registry.model.domain.DomainApplication; import google.registry.testing.ExceptionRule; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/model/index/EppResourceIndexTest.java b/javatests/google/registry/model/index/EppResourceIndexTest.java index 4bebc7332..6f34d6d96 100644 --- a/javatests/google/registry/model/index/EppResourceIndexTest.java +++ b/javatests/google/registry/model/index/EppResourceIndexTest.java @@ -22,13 +22,10 @@ import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; - import com.googlecode.objectify.Key; - import google.registry.config.RegistryEnvironment; import google.registry.model.EntityTestCase; import google.registry.model.contact.ContactResource; - import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/model/index/ForeignKeyIndexTest.java b/javatests/google/registry/model/index/ForeignKeyIndexTest.java index 1bd5afdc5..8a81e09b0 100644 --- a/javatests/google/registry/model/index/ForeignKeyIndexTest.java +++ b/javatests/google/registry/model/index/ForeignKeyIndexTest.java @@ -21,14 +21,11 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.collect.ImmutableList; - import com.googlecode.objectify.Ref; - import google.registry.model.EntityTestCase; import google.registry.model.host.HostResource; import google.registry.model.index.ForeignKeyIndex.ForeignKeyHostIndex; import google.registry.testing.ExceptionRule; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/mark/MarkProtectionTest.java b/javatests/google/registry/model/mark/MarkProtectionTest.java index 745aa8b84..84ec8d11f 100644 --- a/javatests/google/registry/model/mark/MarkProtectionTest.java +++ b/javatests/google/registry/model/mark/MarkProtectionTest.java @@ -17,7 +17,6 @@ package google.registry.model.mark; import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/javatests/google/registry/model/ofy/CommitLogBucketTest.java b/javatests/google/registry/model/ofy/CommitLogBucketTest.java index cc0674e8b..eb954866e 100644 --- a/javatests/google/registry/model/ofy/CommitLogBucketTest.java +++ b/javatests/google/registry/model/ofy/CommitLogBucketTest.java @@ -23,15 +23,12 @@ import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.annotation.Cache; - import google.registry.config.TestRegistryConfig; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.InjectRule; import google.registry.testing.RegistryConfigRule; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/ofy/CommitLogCheckpointTest.java b/javatests/google/registry/model/ofy/CommitLogCheckpointTest.java index 30f1119db..ac99accb4 100644 --- a/javatests/google/registry/model/ofy/CommitLogCheckpointTest.java +++ b/javatests/google/registry/model/ofy/CommitLogCheckpointTest.java @@ -19,12 +19,10 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableMap; - import google.registry.config.TestRegistryConfig; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.RegistryConfigRule; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/model/ofy/CommitLogMutationTest.java b/javatests/google/registry/model/ofy/CommitLogMutationTest.java index dc628b557..4ff350f42 100644 --- a/javatests/google/registry/model/ofy/CommitLogMutationTest.java +++ b/javatests/google/registry/model/ofy/CommitLogMutationTest.java @@ -21,14 +21,11 @@ import static google.registry.testing.DatastoreHelper.createTld; import com.google.appengine.api.datastore.Entity; import com.google.appengine.api.datastore.EntityTranslator; import com.google.appengine.api.datastore.KeyFactory; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Work; - import google.registry.model.ImmutableObject; import google.registry.model.registry.Registry; import google.registry.testing.AppEngineRule; - import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Before; diff --git a/javatests/google/registry/model/ofy/ObjectifyServiceTest.java b/javatests/google/registry/model/ofy/ObjectifyServiceTest.java index 6440a3105..93c60df8d 100644 --- a/javatests/google/registry/model/ofy/ObjectifyServiceTest.java +++ b/javatests/google/registry/model/ofy/ObjectifyServiceTest.java @@ -15,7 +15,6 @@ package google.registry.model.ofy; import google.registry.testing.AppEngineRule; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/model/ofy/OfyCommitLogTest.java b/javatests/google/registry/model/ofy/OfyCommitLogTest.java index 4ee5b4fcc..4d11fe5df 100644 --- a/javatests/google/registry/model/ofy/OfyCommitLogTest.java +++ b/javatests/google/registry/model/ofy/OfyCommitLogTest.java @@ -22,13 +22,11 @@ import static google.registry.model.ofy.CommitLogBucket.getBucketKey; import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Parent; - import google.registry.model.BackupGroupRoot; import google.registry.model.ImmutableObject; import google.registry.model.common.EntityGroupRoot; @@ -36,7 +34,6 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/model/ofy/OfyFilterTest.java b/javatests/google/registry/model/ofy/OfyFilterTest.java index b99d91758..a8b2cbc57 100644 --- a/javatests/google/registry/model/ofy/OfyFilterTest.java +++ b/javatests/google/registry/model/ofy/OfyFilterTest.java @@ -19,16 +19,13 @@ import static google.registry.model.ofy.ObjectifyService.initOfy; import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig; import com.google.appengine.tools.development.testing.LocalServiceTestHelper; - import com.googlecode.objectify.Key; import com.googlecode.objectify.ObjectifyFactory; import com.googlecode.objectify.ObjectifyFilter; import com.googlecode.objectify.ObjectifyService; - import google.registry.model.registrar.Registrar; import google.registry.model.registrar.Registrar.Type; import google.registry.testing.ExceptionRule; - import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/model/ofy/OfyTest.java b/javatests/google/registry/model/ofy/OfyTest.java index 09c78be3f..83cfeb31b 100644 --- a/javatests/google/registry/model/ofy/OfyTest.java +++ b/javatests/google/registry/model/ofy/OfyTest.java @@ -33,7 +33,6 @@ import com.google.appengine.api.datastore.DatastoreFailureException; import com.google.appengine.api.datastore.DatastoreTimeoutException; import com.google.appengine.api.datastore.Entity; import com.google.appengine.api.taskqueue.TransientFailureException; - import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.Work; @@ -41,7 +40,6 @@ import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.OnLoad; import com.googlecode.objectify.annotation.OnSave; import com.googlecode.objectify.annotation.Parent; - import google.registry.model.ImmutableObject; import google.registry.model.contact.ContactResource; import google.registry.model.domain.DomainBase; @@ -53,7 +51,7 @@ import google.registry.testing.DatastoreHelper; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; import google.registry.util.SystemClock; - +import java.util.ConcurrentModificationException; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; @@ -61,8 +59,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.ConcurrentModificationException; - /** Tests for our wrapper around Objectify. */ @RunWith(JUnit4.class) public class OfyTest { diff --git a/javatests/google/registry/model/poll/PollMessageExternalKeyConverterTest.java b/javatests/google/registry/model/poll/PollMessageExternalKeyConverterTest.java index 1f9d7799f..2a6418416 100644 --- a/javatests/google/registry/model/poll/PollMessageExternalKeyConverterTest.java +++ b/javatests/google/registry/model/poll/PollMessageExternalKeyConverterTest.java @@ -24,7 +24,6 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.DateTimeZone.UTC; import com.googlecode.objectify.Key; - import google.registry.model.domain.Period; import google.registry.model.eppcommon.Trid; import google.registry.model.ofy.Ofy; @@ -34,7 +33,6 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/model/poll/PollMessageTest.java b/javatests/google/registry/model/poll/PollMessageTest.java index 11189ce17..b8121541b 100644 --- a/javatests/google/registry/model/poll/PollMessageTest.java +++ b/javatests/google/registry/model/poll/PollMessageTest.java @@ -25,7 +25,6 @@ import google.registry.model.EntityTestCase; import google.registry.model.domain.Period; import google.registry.model.eppcommon.Trid; import google.registry.model.reporting.HistoryEntry; - import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/model/rde/RdeNamingUtilsTest.java b/javatests/google/registry/model/rde/RdeNamingUtilsTest.java index 0fe446397..5bf9e1a4c 100644 --- a/javatests/google/registry/model/rde/RdeNamingUtilsTest.java +++ b/javatests/google/registry/model/rde/RdeNamingUtilsTest.java @@ -21,7 +21,6 @@ import static google.registry.model.rde.RdeNamingUtils.makePartialName; import static google.registry.model.rde.RdeNamingUtils.makeRydeFilename; import google.registry.testing.ExceptionRule; - import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/rde/RdeRevisionTest.java b/javatests/google/registry/model/rde/RdeRevisionTest.java index 907ce74b0..c5d90bb52 100644 --- a/javatests/google/registry/model/rde/RdeRevisionTest.java +++ b/javatests/google/registry/model/rde/RdeRevisionTest.java @@ -21,12 +21,9 @@ import static google.registry.model.rde.RdeRevision.getNextRevision; import static google.registry.model.rde.RdeRevision.saveRevision; import com.google.common.base.VerifyException; - import com.googlecode.objectify.VoidWork; - import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; - import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/registrar/RegistrarTest.java b/javatests/google/registry/model/registrar/RegistrarTest.java index dbcfc25b6..e48745f91 100644 --- a/javatests/google/registry/model/registrar/RegistrarTest.java +++ b/javatests/google/registry/model/registrar/RegistrarTest.java @@ -28,7 +28,6 @@ import static google.registry.testing.DatastoreHelper.persistSimpleResources; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import google.registry.model.EntityTestCase; import google.registry.model.common.EntityGroupRoot; import google.registry.model.registrar.Registrar.CertificateState; @@ -36,7 +35,6 @@ import google.registry.model.registrar.Registrar.State; import google.registry.model.registrar.Registrar.Type; import google.registry.testing.ExceptionRule; import google.registry.util.CidrAddressBlock; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/registry/RegistriesTest.java b/javatests/google/registry/model/registry/RegistriesTest.java index 62f6e41f4..835a0b6fd 100644 --- a/javatests/google/registry/model/registry/RegistriesTest.java +++ b/javatests/google/registry/model/registry/RegistriesTest.java @@ -18,9 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.testing.DatastoreHelper.createTlds; import com.google.common.net.InternetDomainName; - import google.registry.testing.AppEngineRule; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/javatests/google/registry/model/registry/RegistryTest.java b/javatests/google/registry/model/registry/RegistryTest.java index 97aa900d6..8a97f6a03 100644 --- a/javatests/google/registry/model/registry/RegistryTest.java +++ b/javatests/google/registry/model/registry/RegistryTest.java @@ -31,16 +31,13 @@ import static org.joda.money.CurrencyUnit.USD; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; - import com.googlecode.objectify.Key; - import google.registry.model.EntityTestCase; import google.registry.model.registry.Registry.RegistryNotFoundException; import google.registry.model.registry.Registry.TldState; import google.registry.model.registry.label.PremiumList; import google.registry.model.registry.label.ReservedList; import google.registry.testing.ExceptionRule; - import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/model/registry/label/PremiumListTest.java b/javatests/google/registry/model/registry/label/PremiumListTest.java index 695742409..4754f4b28 100644 --- a/javatests/google/registry/model/registry/label/PremiumListTest.java +++ b/javatests/google/registry/model/registry/label/PremiumListTest.java @@ -24,16 +24,14 @@ import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; - import com.googlecode.objectify.Key; - import google.registry.model.pricing.StaticPremiumListPricingEngine; import google.registry.model.registry.Registry; import google.registry.model.registry.label.PremiumList.PremiumListEntry; import google.registry.model.registry.label.PremiumList.PremiumListRevision; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; - +import java.util.Map; import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; @@ -42,8 +40,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.Map; - /** Unit tests for {@link PremiumList}. */ @RunWith(JUnit4.class) public class PremiumListTest { diff --git a/javatests/google/registry/model/registry/label/ReservedListTest.java b/javatests/google/registry/model/registry/label/ReservedListTest.java index 21299aed1..dfd2d341a 100644 --- a/javatests/google/registry/model/registry/label/ReservedListTest.java +++ b/javatests/google/registry/model/registry/label/ReservedListTest.java @@ -29,9 +29,7 @@ import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; - import google.registry.model.ofy.Ofy; import google.registry.model.registry.Registry; import google.registry.model.registry.label.ReservedList.ReservedListEntry; @@ -39,7 +37,6 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/model/reporting/HistoryEntryTest.java b/javatests/google/registry/model/reporting/HistoryEntryTest.java index 3736e5f50..6eb880945 100644 --- a/javatests/google/registry/model/reporting/HistoryEntryTest.java +++ b/javatests/google/registry/model/reporting/HistoryEntryTest.java @@ -24,7 +24,6 @@ import static java.nio.charset.StandardCharsets.UTF_8; import google.registry.model.EntityTestCase; import google.registry.model.domain.Period; import google.registry.model.eppcommon.Trid; - import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/model/server/LockTest.java b/javatests/google/registry/model/server/LockTest.java index 0b17f65af..35218ff6b 100644 --- a/javatests/google/registry/model/server/LockTest.java +++ b/javatests/google/registry/model/server/LockTest.java @@ -21,7 +21,6 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; - import org.joda.time.Duration; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/smd/SignedMarkRevocationListTest.java b/javatests/google/registry/model/smd/SignedMarkRevocationListTest.java index 98b63b784..fb3eadcd6 100644 --- a/javatests/google/registry/model/smd/SignedMarkRevocationListTest.java +++ b/javatests/google/registry/model/smd/SignedMarkRevocationListTest.java @@ -21,13 +21,10 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.time.Duration.standardDays; import com.google.common.collect.ImmutableMap; - import com.googlecode.objectify.VoidWork; - import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; - import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/tmch/ClaimsListShardTest.java b/javatests/google/registry/model/tmch/ClaimsListShardTest.java index a8f6a5292..351de6e76 100644 --- a/javatests/google/registry/model/tmch/ClaimsListShardTest.java +++ b/javatests/google/registry/model/tmch/ClaimsListShardTest.java @@ -20,25 +20,21 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableMap; - import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; - import google.registry.model.tmch.ClaimsListShard.ClaimsListRevision; import google.registry.model.tmch.ClaimsListShard.UnshardedSaveException; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; - +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** Unit tests for {@link ClaimsListShard}. */ @RunWith(JUnit4.class) public class ClaimsListShardTest { diff --git a/javatests/google/registry/model/tmch/TmchCrlTest.java b/javatests/google/registry/model/tmch/TmchCrlTest.java index f28415a80..f70370e6e 100644 --- a/javatests/google/registry/model/tmch/TmchCrlTest.java +++ b/javatests/google/registry/model/tmch/TmchCrlTest.java @@ -17,7 +17,6 @@ package google.registry.model.tmch; import static com.google.common.truth.Truth.assertThat; import google.registry.testing.AppEngineRule; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/model/transfer/TransferDataTest.java b/javatests/google/registry/model/transfer/TransferDataTest.java index b26c052af..ae295bd51 100644 --- a/javatests/google/registry/model/transfer/TransferDataTest.java +++ b/javatests/google/registry/model/transfer/TransferDataTest.java @@ -22,10 +22,8 @@ import static org.joda.money.CurrencyUnit.USD; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.model.billing.BillingEvent; import google.registry.model.billing.BillingEvent.Flag; import google.registry.model.billing.BillingEvent.Reason; @@ -35,7 +33,6 @@ import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferData.TransferServerApproveEntity; import google.registry.testing.AppEngineRule; import google.registry.testing.DatastoreHelper; - import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java b/javatests/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java index 76cf08b30..75748fdff 100644 --- a/javatests/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java +++ b/javatests/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java @@ -21,13 +21,11 @@ import static org.joda.time.Duration.standardHours; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSortedMap; - import com.googlecode.objectify.ObjectifyService; import com.googlecode.objectify.Ref; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.Work; import com.googlecode.objectify.annotation.Entity; - import google.registry.config.TestRegistryConfig; import google.registry.model.common.CrossTldSingleton; import google.registry.model.ofy.CommitLogManifest; @@ -37,7 +35,7 @@ import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; import google.registry.testing.RegistryConfigRule; - +import java.util.List; import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Before; @@ -46,8 +44,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.List; - /** Unit tests for {@link CommitLogRevisionsTranslatorFactory}. */ @RunWith(JUnit4.class) public class CommitLogRevisionsTranslatorFactoryTest { diff --git a/javatests/google/registry/model/translators/StatusValueAdapterTest.java b/javatests/google/registry/model/translators/StatusValueAdapterTest.java index 28ad2926d..9e99e8924 100644 --- a/javatests/google/registry/model/translators/StatusValueAdapterTest.java +++ b/javatests/google/registry/model/translators/StatusValueAdapterTest.java @@ -19,7 +19,6 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import google.registry.flows.EppXmlTransformer; import google.registry.model.eppcommon.StatusValue; import google.registry.model.eppinput.EppInput; @@ -31,7 +30,6 @@ import google.registry.model.host.HostResource; import google.registry.testing.AppEngineRule; import google.registry.testing.EppLoader; import google.registry.xml.ValidationMode; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/module/backend/BackendServletTest.java b/javatests/google/registry/module/backend/BackendServletTest.java index b145655cf..1db7f4db5 100644 --- a/javatests/google/registry/module/backend/BackendServletTest.java +++ b/javatests/google/registry/module/backend/BackendServletTest.java @@ -18,13 +18,12 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** Unit tests for {@link BackendServlet}. */ @RunWith(JUnit4.class) public class BackendServletTest { diff --git a/javatests/google/registry/module/frontend/FrontendServletTest.java b/javatests/google/registry/module/frontend/FrontendServletTest.java index 452855fbd..78d376f21 100644 --- a/javatests/google/registry/module/frontend/FrontendServletTest.java +++ b/javatests/google/registry/module/frontend/FrontendServletTest.java @@ -18,13 +18,12 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** Unit tests for {@link FrontendServlet}. */ @RunWith(JUnit4.class) public class FrontendServletTest { diff --git a/javatests/google/registry/module/tools/ToolsServletTest.java b/javatests/google/registry/module/tools/ToolsServletTest.java index 434be32c3..3194a195e 100644 --- a/javatests/google/registry/module/tools/ToolsServletTest.java +++ b/javatests/google/registry/module/tools/ToolsServletTest.java @@ -18,13 +18,12 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** Unit tests for {@link ToolsServlet}. */ @RunWith(JUnit4.class) public class ToolsServletTest { diff --git a/javatests/google/registry/monitoring/whitebox/MetricsExportActionTest.java b/javatests/google/registry/monitoring/whitebox/MetricsExportActionTest.java index 1f081cc88..b2b351b06 100644 --- a/javatests/google/registry/monitoring/whitebox/MetricsExportActionTest.java +++ b/javatests/google/registry/monitoring/whitebox/MetricsExportActionTest.java @@ -30,10 +30,8 @@ import com.google.api.services.bigquery.model.TableDataInsertAllResponse; import com.google.api.services.bigquery.model.TableDataInsertAllResponse.InsertErrors; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; - import google.registry.bigquery.BigqueryFactory; import google.registry.testing.AppEngineRule; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/monitoring/whitebox/MetricsTest.java b/javatests/google/registry/monitoring/whitebox/MetricsTest.java index 126b0f538..cf0086575 100644 --- a/javatests/google/registry/monitoring/whitebox/MetricsTest.java +++ b/javatests/google/registry/monitoring/whitebox/MetricsTest.java @@ -17,12 +17,10 @@ package google.registry.monitoring.whitebox; import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; import com.google.common.base.Suppliers; - import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; import google.registry.testing.TaskQueueHelper.TaskMatcher; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/monitoring/whitebox/VerifyEntityIntegrityActionTest.java b/javatests/google/registry/monitoring/whitebox/VerifyEntityIntegrityActionTest.java index 1aead998f..a4ac9e0f8 100644 --- a/javatests/google/registry/monitoring/whitebox/VerifyEntityIntegrityActionTest.java +++ b/javatests/google/registry/monitoring/whitebox/VerifyEntityIntegrityActionTest.java @@ -41,10 +41,8 @@ import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.bigquery.BigqueryFactory; import google.registry.config.RegistryEnvironment; import google.registry.mapreduce.MapreduceRunner; @@ -62,7 +60,7 @@ import google.registry.testing.FakeSleeper; import google.registry.testing.InjectRule; import google.registry.testing.mapreduce.MapreduceTestCase; import google.registry.util.Retrier; - +import java.util.Map; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Before; @@ -73,8 +71,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import java.util.Map; - /** Unit tests for {@link VerifyEntityIntegrityAction}. */ @RunWith(MockitoJUnitRunner.class) public class VerifyEntityIntegrityActionTest diff --git a/javatests/google/registry/pricing/PricingEngineProxyTest.java b/javatests/google/registry/pricing/PricingEngineProxyTest.java index d23915cca..bd671098d 100644 --- a/javatests/google/registry/pricing/PricingEngineProxyTest.java +++ b/javatests/google/registry/pricing/PricingEngineProxyTest.java @@ -25,7 +25,6 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.money.CurrencyUnit.USD; import com.google.common.collect.ImmutableSortedMap; - import google.registry.model.pricing.PremiumPricingEngine; import google.registry.model.registry.Registry; import google.registry.model.registry.label.PremiumList; @@ -33,7 +32,6 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; import google.registry.util.Clock; - import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/pricing/TldSpecificLogicProxyTest.java b/javatests/google/registry/pricing/TldSpecificLogicProxyTest.java index 0c1c448a8..f1a1fb388 100644 --- a/javatests/google/registry/pricing/TldSpecificLogicProxyTest.java +++ b/javatests/google/registry/pricing/TldSpecificLogicProxyTest.java @@ -22,14 +22,12 @@ import static org.joda.money.CurrencyUnit.USD; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSortedMap; - import google.registry.model.domain.fee.Fee; import google.registry.model.ofy.Ofy; import google.registry.model.registry.Registry; import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; - import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/rdap/RdapActionBaseTest.java b/javatests/google/registry/rdap/RdapActionBaseTest.java index 4f6de6149..b391ab040 100644 --- a/javatests/google/registry/rdap/RdapActionBaseTest.java +++ b/javatests/google/registry/rdap/RdapActionBaseTest.java @@ -22,7 +22,6 @@ import static google.registry.testing.DatastoreHelper.createTld; import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import com.google.common.collect.ImmutableMap; - import google.registry.model.ofy.Ofy; import google.registry.rdap.RdapJsonFormatter.BoilerplateType; import google.registry.request.HttpException; @@ -30,7 +29,6 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; import google.registry.testing.InjectRule; - import org.joda.time.DateTime; import org.json.simple.JSONValue; import org.junit.Before; diff --git a/javatests/google/registry/rdap/RdapDomainActionTest.java b/javatests/google/registry/rdap/RdapDomainActionTest.java index 748c8a458..18bc2b617 100644 --- a/javatests/google/registry/rdap/RdapDomainActionTest.java +++ b/javatests/google/registry/rdap/RdapDomainActionTest.java @@ -28,7 +28,6 @@ import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import google.registry.model.contact.ContactResource; import google.registry.model.domain.DomainBase; import google.registry.model.domain.Period; @@ -41,7 +40,7 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; import google.registry.testing.InjectRule; - +import java.util.Map; import org.joda.time.DateTime; import org.json.simple.JSONValue; import org.junit.Before; @@ -51,8 +50,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.Map; - /** Unit tests for {@link RdapDomainAction}. */ @RunWith(JUnit4.class) public class RdapDomainActionTest { diff --git a/javatests/google/registry/rdap/RdapDomainSearchActionTest.java b/javatests/google/registry/rdap/RdapDomainSearchActionTest.java index 064803b95..026a2ed06 100644 --- a/javatests/google/registry/rdap/RdapDomainSearchActionTest.java +++ b/javatests/google/registry/rdap/RdapDomainSearchActionTest.java @@ -33,9 +33,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Range; import com.google.common.net.InetAddresses; - import com.googlecode.objectify.Ref; - import google.registry.model.domain.DomainResource; import google.registry.model.domain.Period; import google.registry.model.host.HostResource; @@ -47,7 +45,6 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; import google.registry.testing.InjectRule; - import org.joda.time.DateTime; import org.json.simple.JSONValue; import org.junit.Before; diff --git a/javatests/google/registry/rdap/RdapEntityActionTest.java b/javatests/google/registry/rdap/RdapEntityActionTest.java index 373d75ffe..2b70de2dd 100644 --- a/javatests/google/registry/rdap/RdapEntityActionTest.java +++ b/javatests/google/registry/rdap/RdapEntityActionTest.java @@ -28,7 +28,6 @@ import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import google.registry.model.contact.ContactResource; import google.registry.model.host.HostResource; import google.registry.model.ofy.Ofy; @@ -37,7 +36,7 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; import google.registry.testing.InjectRule; - +import java.util.Map; import org.joda.time.DateTime; import org.json.simple.JSONValue; import org.junit.Before; @@ -46,8 +45,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.Map; - /** Unit tests for {@link RdapEntityAction}. */ @RunWith(JUnit4.class) public class RdapEntityActionTest { diff --git a/javatests/google/registry/rdap/RdapEntitySearchActionTest.java b/javatests/google/registry/rdap/RdapEntitySearchActionTest.java index 70b55263a..46a6db06f 100644 --- a/javatests/google/registry/rdap/RdapEntitySearchActionTest.java +++ b/javatests/google/registry/rdap/RdapEntitySearchActionTest.java @@ -27,7 +27,6 @@ import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import google.registry.model.contact.ContactResource; import google.registry.model.ofy.Ofy; import google.registry.model.registrar.Registrar; @@ -35,7 +34,7 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; import google.registry.testing.InjectRule; - +import javax.annotation.Nullable; import org.joda.time.DateTime; import org.json.simple.JSONValue; import org.junit.Before; @@ -44,8 +43,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import javax.annotation.Nullable; - /** Unit tests for {@link RdapEntitySearchAction}. */ @RunWith(JUnit4.class) public class RdapEntitySearchActionTest { diff --git a/javatests/google/registry/rdap/RdapHelpActionTest.java b/javatests/google/registry/rdap/RdapHelpActionTest.java index c8a59dc10..17f6c21cd 100644 --- a/javatests/google/registry/rdap/RdapHelpActionTest.java +++ b/javatests/google/registry/rdap/RdapHelpActionTest.java @@ -18,12 +18,10 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import com.google.common.collect.ImmutableMap; - import google.registry.model.ofy.Ofy; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; import google.registry.testing.InjectRule; - import org.joda.time.DateTime; import org.json.simple.JSONValue; import org.junit.Before; diff --git a/javatests/google/registry/rdap/RdapJsonFormatterTest.java b/javatests/google/registry/rdap/RdapJsonFormatterTest.java index 099f851d8..9d0660e94 100644 --- a/javatests/google/registry/rdap/RdapJsonFormatterTest.java +++ b/javatests/google/registry/rdap/RdapJsonFormatterTest.java @@ -30,7 +30,6 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import google.registry.model.contact.ContactResource; import google.registry.model.domain.DesignatedContact; import google.registry.model.domain.DomainResource; @@ -45,7 +44,6 @@ import google.registry.rdap.RdapJsonFormatter.MakeRdapJsonNoticeParameters; import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; - import org.joda.time.DateTime; import org.json.simple.JSONValue; import org.junit.Before; diff --git a/javatests/google/registry/rdap/RdapNameserverActionTest.java b/javatests/google/registry/rdap/RdapNameserverActionTest.java index de92659c7..482219a46 100644 --- a/javatests/google/registry/rdap/RdapNameserverActionTest.java +++ b/javatests/google/registry/rdap/RdapNameserverActionTest.java @@ -22,13 +22,13 @@ import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import com.google.appengine.api.NamespaceManager; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import google.registry.model.ofy.Ofy; import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; import google.registry.testing.InjectRule; - +import java.util.Map; +import javax.annotation.Nullable; import org.joda.time.DateTime; import org.json.simple.JSONValue; import org.junit.Before; @@ -37,10 +37,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.Map; - -import javax.annotation.Nullable; - /** Unit tests for {@link RdapNameserverAction}. */ @RunWith(JUnit4.class) public class RdapNameserverActionTest { diff --git a/javatests/google/registry/rdap/RdapNameserverSearchActionTest.java b/javatests/google/registry/rdap/RdapNameserverSearchActionTest.java index af79fd862..104087b68 100644 --- a/javatests/google/registry/rdap/RdapNameserverSearchActionTest.java +++ b/javatests/google/registry/rdap/RdapNameserverSearchActionTest.java @@ -30,9 +30,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; - import com.googlecode.objectify.Ref; - import google.registry.model.domain.DomainResource; import google.registry.model.host.HostResource; import google.registry.model.ofy.Ofy; @@ -41,7 +39,6 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; import google.registry.testing.InjectRule; - import org.joda.time.DateTime; import org.json.simple.JSONValue; import org.junit.Before; diff --git a/javatests/google/registry/rdap/RdapSearchPatternTest.java b/javatests/google/registry/rdap/RdapSearchPatternTest.java index ee1213374..33be42f88 100644 --- a/javatests/google/registry/rdap/RdapSearchPatternTest.java +++ b/javatests/google/registry/rdap/RdapSearchPatternTest.java @@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat; import google.registry.request.HttpException.UnprocessableEntityException; import google.registry.testing.ExceptionRule; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/rde/BouncyCastleTest.java b/javatests/google/registry/rde/BouncyCastleTest.java index 15a9bd036..f09a9ef86 100644 --- a/javatests/google/registry/rde/BouncyCastleTest.java +++ b/javatests/google/registry/rde/BouncyCastleTest.java @@ -23,10 +23,14 @@ import static org.bouncycastle.bcpg.PublicKeyAlgorithmTags.RSA_GENERAL; import static org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags.AES_128; import com.google.common.io.CharStreams; - import google.registry.testing.BouncyCastleProviderRule; import google.registry.util.FormattingLogger; - +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.util.Iterator; import org.bouncycastle.openpgp.PGPCompressedData; import org.bouncycastle.openpgp.PGPCompressedDataGenerator; import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; @@ -66,13 +70,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.util.Iterator; - /** * Bouncy Castle – How does it work?! * diff --git a/javatests/google/registry/rde/BrdaCopyActionTest.java b/javatests/google/registry/rde/BrdaCopyActionTest.java index 06472189b..429b93bbe 100644 --- a/javatests/google/registry/rde/BrdaCopyActionTest.java +++ b/javatests/google/registry/rde/BrdaCopyActionTest.java @@ -28,7 +28,6 @@ import com.google.appengine.tools.cloudstorage.GcsServiceFactory; import com.google.common.io.ByteSource; import com.google.common.io.CharStreams; import com.google.common.io.Files; - import google.registry.gcs.GcsUtils; import google.registry.keyring.api.Keyring; import google.registry.testing.AppEngineRule; @@ -36,7 +35,11 @@ import google.registry.testing.BouncyCastleProviderRule; import google.registry.testing.GcsTestingUtils; import google.registry.testing.GpgSystemCommandRule; import google.registry.testing.Providers; - +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPrivateKey; import org.bouncycastle.openpgp.PGPPublicKey; @@ -48,12 +51,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; - /** Unit tests for {@link BrdaCopyAction}. */ @RunWith(JUnit4.class) public class BrdaCopyActionTest { diff --git a/javatests/google/registry/rde/ContactResourceToXjcConverterTest.java b/javatests/google/registry/rde/ContactResourceToXjcConverterTest.java index ce46a89fd..0c3db0f97 100644 --- a/javatests/google/registry/rde/ContactResourceToXjcConverterTest.java +++ b/javatests/google/registry/rde/ContactResourceToXjcConverterTest.java @@ -22,7 +22,6 @@ import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import google.registry.model.contact.ContactAddress; import google.registry.model.contact.ContactAuthInfo; import google.registry.model.contact.ContactPhoneNumber; @@ -47,7 +46,7 @@ import google.registry.xjc.rde.XjcRdeDepositTypeType; import google.registry.xjc.rde.XjcRdeMenuType; import google.registry.xjc.rdecontact.XjcRdeContact; import google.registry.xjc.rdecontact.XjcRdeContactElement; - +import java.io.ByteArrayOutputStream; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; @@ -55,8 +54,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.ByteArrayOutputStream; - /** * Unit tests for {@link ContactResourceToXjcConverter}. * diff --git a/javatests/google/registry/rde/DomainResourceToXjcConverterTest.java b/javatests/google/registry/rde/DomainResourceToXjcConverterTest.java index ae6364b67..c76ad8600 100644 --- a/javatests/google/registry/rde/DomainResourceToXjcConverterTest.java +++ b/javatests/google/registry/rde/DomainResourceToXjcConverterTest.java @@ -31,10 +31,8 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.model.billing.BillingEvent; import google.registry.model.billing.BillingEvent.Flag; import google.registry.model.billing.BillingEvent.Reason; @@ -74,7 +72,7 @@ import google.registry.xjc.rdedomain.XjcRdeDomainElement; import google.registry.xjc.rgp.XjcRgpStatusType; import google.registry.xjc.rgp.XjcRgpStatusValueType; import google.registry.xjc.secdns.XjcSecdnsDsDataType; - +import java.io.ByteArrayOutputStream; import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; @@ -83,8 +81,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.ByteArrayOutputStream; - /** * Unit tests for {@link DomainResourceToXjcConverter}. * diff --git a/javatests/google/registry/rde/EscrowTaskRunnerTest.java b/javatests/google/registry/rde/EscrowTaskRunnerTest.java index 88487e726..eeb7e6e51 100644 --- a/javatests/google/registry/rde/EscrowTaskRunnerTest.java +++ b/javatests/google/registry/rde/EscrowTaskRunnerTest.java @@ -33,7 +33,7 @@ import google.registry.request.HttpException.ServiceUnavailableException; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; - +import java.util.concurrent.Callable; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Before; @@ -42,8 +42,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.concurrent.Callable; - /** Unit tests for {@link EscrowTaskRunner}. */ @RunWith(JUnit4.class) public class EscrowTaskRunnerTest { diff --git a/javatests/google/registry/rde/GhostrydeGpgIntegrationTest.java b/javatests/google/registry/rde/GhostrydeGpgIntegrationTest.java index c680c1dc6..5c811b068 100644 --- a/javatests/google/registry/rde/GhostrydeGpgIntegrationTest.java +++ b/javatests/google/registry/rde/GhostrydeGpgIntegrationTest.java @@ -22,20 +22,10 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assume.assumeTrue; import com.google.common.io.CharStreams; - import google.registry.keyring.api.Keyring; import google.registry.testing.BouncyCastleProviderRule; import google.registry.testing.GpgSystemCommandRule; import google.registry.testing.ShardableTestCase; - -import org.bouncycastle.openpgp.PGPPublicKey; -import org.joda.time.DateTime; -import org.junit.Rule; -import org.junit.experimental.theories.DataPoints; -import org.junit.experimental.theories.Theories; -import org.junit.experimental.theories.Theory; -import org.junit.runner.RunWith; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -43,6 +33,13 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStream; +import org.bouncycastle.openpgp.PGPPublicKey; +import org.joda.time.DateTime; +import org.junit.Rule; +import org.junit.experimental.theories.DataPoints; +import org.junit.experimental.theories.Theories; +import org.junit.experimental.theories.Theory; +import org.junit.runner.RunWith; /** GnuPG integration tests for {@link Ghostryde}. */ @RunWith(Theories.class) diff --git a/javatests/google/registry/rde/GhostrydeTest.java b/javatests/google/registry/rde/GhostrydeTest.java index 5b8f9c5ef..ee885d02f 100644 --- a/javatests/google/registry/rde/GhostrydeTest.java +++ b/javatests/google/registry/rde/GhostrydeTest.java @@ -24,12 +24,13 @@ import static org.hamcrest.Matchers.lessThan; import static org.junit.Assume.assumeThat; import com.google.common.io.ByteStreams; - import google.registry.keyring.api.Keyring; import google.registry.rde.Ghostryde.DecodeResult; import google.registry.testing.BouncyCastleProviderRule; import google.registry.testing.ExceptionRule; - +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPrivateKey; @@ -43,10 +44,6 @@ import org.junit.experimental.theories.Theories; import org.junit.experimental.theories.Theory; import org.junit.runner.RunWith; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.OutputStream; - /** Unit tests for {@link Ghostryde}. */ @RunWith(Theories.class) @SuppressWarnings("resource") diff --git a/javatests/google/registry/rde/HostResourceToXjcConverterTest.java b/javatests/google/registry/rde/HostResourceToXjcConverterTest.java index eb6537199..1c265592c 100644 --- a/javatests/google/registry/rde/HostResourceToXjcConverterTest.java +++ b/javatests/google/registry/rde/HostResourceToXjcConverterTest.java @@ -21,7 +21,6 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; - import google.registry.model.eppcommon.StatusValue; import google.registry.model.host.HostResource; import google.registry.testing.AppEngineRule; @@ -29,7 +28,7 @@ import google.registry.testing.ExceptionRule; import google.registry.xjc.host.XjcHostStatusValueType; import google.registry.xjc.rdehost.XjcRdeHost; import google.registry.xjc.rdehost.XjcRdeHostElement; - +import java.io.ByteArrayOutputStream; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; @@ -37,8 +36,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.ByteArrayOutputStream; - /** * Unit tests for {@link HostResourceToXjcConverter}. * diff --git a/javatests/google/registry/rde/PendingDepositCheckerTest.java b/javatests/google/registry/rde/PendingDepositCheckerTest.java index d1190946d..802dba78c 100644 --- a/javatests/google/registry/rde/PendingDepositCheckerTest.java +++ b/javatests/google/registry/rde/PendingDepositCheckerTest.java @@ -26,9 +26,7 @@ import static org.joda.time.DateTimeConstants.TUESDAY; import static org.joda.time.Duration.standardDays; import com.google.common.collect.ImmutableSetMultimap; - import com.googlecode.objectify.VoidWork; - import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; import google.registry.model.ofy.Ofy; @@ -36,7 +34,6 @@ import google.registry.model.registry.Registry; import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Ignore; diff --git a/javatests/google/registry/rde/RdeFixtures.java b/javatests/google/registry/rde/RdeFixtures.java index a85f11b7d..76eeabc0c 100644 --- a/javatests/google/registry/rde/RdeFixtures.java +++ b/javatests/google/registry/rde/RdeFixtures.java @@ -26,10 +26,8 @@ import static org.joda.money.CurrencyUnit.USD; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; - import google.registry.model.billing.BillingEvent; import google.registry.model.billing.BillingEvent.Flag; import google.registry.model.billing.BillingEvent.Reason; @@ -55,7 +53,6 @@ import google.registry.model.transfer.TransferData.TransferServerApproveEntity; import google.registry.model.transfer.TransferStatus; import google.registry.testing.FakeClock; import google.registry.util.Idn; - import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/javatests/google/registry/rde/RdeKeyringModule.java b/javatests/google/registry/rde/RdeKeyringModule.java index 36343fb38..6007bfe92 100644 --- a/javatests/google/registry/rde/RdeKeyringModule.java +++ b/javatests/google/registry/rde/RdeKeyringModule.java @@ -18,14 +18,14 @@ import static google.registry.keyring.api.PgpHelper.KeyRequirement.ENCRYPT; import static google.registry.keyring.api.PgpHelper.KeyRequirement.SIGN; import com.google.common.io.ByteSource; - import dagger.Module; import dagger.Provides; - import google.registry.keyring.api.Keyring; import google.registry.keyring.api.PgpHelper; import google.registry.keyring.api.PgpHelper.KeyRequirement; - +import java.io.IOException; +import java.io.InputStream; +import javax.annotation.concurrent.Immutable; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPrivateKey; @@ -36,11 +36,6 @@ import org.bouncycastle.openpgp.PGPUtil; import org.bouncycastle.openpgp.bc.BcPGPPublicKeyRingCollection; import org.bouncycastle.openpgp.bc.BcPGPSecretKeyRingCollection; -import java.io.IOException; -import java.io.InputStream; - -import javax.annotation.concurrent.Immutable; - /** Keyring factory that loads keys {@code javatests/.../rde/testdata} */ @Module @Immutable diff --git a/javatests/google/registry/rde/RdeMarshallerTest.java b/javatests/google/registry/rde/RdeMarshallerTest.java index b7aa885a8..283a77882 100644 --- a/javatests/google/registry/rde/RdeMarshallerTest.java +++ b/javatests/google/registry/rde/RdeMarshallerTest.java @@ -19,7 +19,6 @@ import static com.google.common.truth.Truth.assertThat; import google.registry.model.registrar.Registrar; import google.registry.testing.AppEngineRule; import google.registry.xml.XmlTestUtils; - import org.joda.time.DateTime; import org.joda.time.format.ISODateTimeFormat; import org.junit.Rule; diff --git a/javatests/google/registry/rde/RdeParserTest.java b/javatests/google/registry/rde/RdeParserTest.java index 09f26ea6f..fd8f9f471 100644 --- a/javatests/google/registry/rde/RdeParserTest.java +++ b/javatests/google/registry/rde/RdeParserTest.java @@ -17,7 +17,6 @@ package google.registry.rde; import static com.google.common.truth.Truth.assertThat; import com.google.common.io.ByteSource; - import google.registry.rde.RdeParser.RdeHeader; import google.registry.testing.ExceptionRule; import google.registry.xjc.rdecontact.XjcRdeContact; @@ -27,7 +26,9 @@ import google.registry.xjc.rdehost.XjcRdeHost; import google.registry.xjc.rdeidn.XjcRdeIdn; import google.registry.xjc.rdenndn.XjcRdeNndn; import google.registry.xjc.rderegistrar.XjcRdeRegistrar; - +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -35,10 +36,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; - /** Unit tests for {@link RdeParser}. */ @RunWith(JUnit4.class) public class RdeParserTest { diff --git a/javatests/google/registry/rde/RdeReportActionTest.java b/javatests/google/registry/rde/RdeReportActionTest.java index 0a74b8d0e..142f3768f 100644 --- a/javatests/google/registry/rde/RdeReportActionTest.java +++ b/javatests/google/registry/rde/RdeReportActionTest.java @@ -40,7 +40,6 @@ import com.google.appengine.tools.cloudstorage.GcsService; import com.google.appengine.tools.cloudstorage.GcsServiceFactory; import com.google.common.collect.ImmutableMap; import com.google.common.io.ByteSource; - import google.registry.config.RegistryConfig; import google.registry.config.RegistryEnvironment; import google.registry.gcs.GcsUtils; @@ -55,7 +54,8 @@ import google.registry.testing.FakeResponse; import google.registry.xjc.XjcXmlTransformer; import google.registry.xjc.rdereport.XjcRdeReportReport; import google.registry.xml.XmlException; - +import java.io.ByteArrayInputStream; +import java.util.Map; import org.bouncycastle.openpgp.PGPPublicKey; import org.joda.time.DateTime; import org.junit.Before; @@ -65,9 +65,6 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; import org.mockito.ArgumentCaptor; -import java.io.ByteArrayInputStream; -import java.util.Map; - /** Unit tests for {@link RdeReportAction}. */ @RunWith(JUnit4.class) public class RdeReportActionTest { diff --git a/javatests/google/registry/rde/RdeStagingActionTest.java b/javatests/google/registry/rde/RdeStagingActionTest.java index a2b03f3c0..e3274c062 100644 --- a/javatests/google/registry/rde/RdeStagingActionTest.java +++ b/javatests/google/registry/rde/RdeStagingActionTest.java @@ -40,9 +40,7 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; - import com.googlecode.objectify.VoidWork; - import google.registry.keyring.api.Keyring; import google.registry.keyring.api.PgpHelper; import google.registry.mapreduce.MapreduceRunner; @@ -73,7 +71,11 @@ import google.registry.xjc.rdeidn.XjcRdeIdn; import google.registry.xjc.rderegistrar.XjcRdeRegistrar; import google.registry.xml.XmlException; import google.registry.xml.XmlTestUtils; - +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.JAXBElement; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPrivateKey; import org.bouncycastle.openpgp.PGPPublicKey; @@ -88,13 +90,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.bind.JAXBElement; - /** Unit tests for {@link RdeStagingAction}. */ @RunWith(JUnit4.class) public class RdeStagingActionTest extends MapreduceTestCase { diff --git a/javatests/google/registry/rde/RdeTestData.java b/javatests/google/registry/rde/RdeTestData.java index 6f4ba6eea..283daf37e 100644 --- a/javatests/google/registry/rde/RdeTestData.java +++ b/javatests/google/registry/rde/RdeTestData.java @@ -18,7 +18,6 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.io.ByteSource; import com.google.common.io.Resources; - import java.io.IOException; import java.net.URL; diff --git a/javatests/google/registry/rde/RdeUploadActionTest.java b/javatests/google/registry/rde/RdeUploadActionTest.java index d29838934..612b3b43a 100644 --- a/javatests/google/registry/rde/RdeUploadActionTest.java +++ b/javatests/google/registry/rde/RdeUploadActionTest.java @@ -42,9 +42,7 @@ import com.google.appengine.tools.cloudstorage.GcsServiceFactory; import com.google.common.io.ByteSource; import com.google.common.io.CharStreams; import com.google.common.io.Files; - import com.googlecode.objectify.VoidWork; - import google.registry.gcs.GcsUtils; import google.registry.keyring.api.Keyring; import google.registry.model.common.Cursor; @@ -66,7 +64,14 @@ import google.registry.testing.TaskQueueHelper.TaskMatcher; import google.registry.testing.sftp.SftpServerRule; import google.registry.util.Retrier; import google.registry.util.TaskEnqueuer; - +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.net.Socket; +import java.net.URI; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPublicKey; import org.joda.time.DateTime; @@ -77,15 +82,6 @@ import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.net.Socket; -import java.net.URI; - /** Unit tests for {@link RdeUploadAction}. */ @RunWith(MockitoJUnitRunner.class) public class RdeUploadActionTest { diff --git a/javatests/google/registry/rde/RegistrarToXjcConverterTest.java b/javatests/google/registry/rde/RegistrarToXjcConverterTest.java index 67d7c7845..330fd6d07 100644 --- a/javatests/google/registry/rde/RegistrarToXjcConverterTest.java +++ b/javatests/google/registry/rde/RegistrarToXjcConverterTest.java @@ -20,7 +20,6 @@ import static google.registry.xjc.XjcXmlTransformer.marshalStrict; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableList; - import google.registry.model.ofy.Ofy; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarAddress; @@ -33,7 +32,7 @@ import google.registry.xjc.rderegistrar.XjcRdeRegistrarAddrType; import google.registry.xjc.rderegistrar.XjcRdeRegistrarPostalInfoEnumType; import google.registry.xjc.rderegistrar.XjcRdeRegistrarPostalInfoType; import google.registry.xjc.rderegistrar.XjcRdeRegistrarStatusType; - +import java.io.ByteArrayOutputStream; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; @@ -41,8 +40,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.ByteArrayOutputStream; - /** * Unit tests for {@link RegistrarToXjcConverter}. * diff --git a/javatests/google/registry/rde/RydeGpgIntegrationTest.java b/javatests/google/registry/rde/RydeGpgIntegrationTest.java index 525b54b3a..f3b717c97 100644 --- a/javatests/google/registry/rde/RydeGpgIntegrationTest.java +++ b/javatests/google/registry/rde/RydeGpgIntegrationTest.java @@ -22,23 +22,12 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assume.assumeTrue; import com.google.common.io.CharStreams; - import google.registry.keyring.api.Keyring; import google.registry.testing.BouncyCastleProviderRule; import google.registry.testing.GpgSystemCommandRule; import google.registry.testing.Providers; import google.registry.testing.ShardableTestCase; import google.registry.util.FormattingLogger; - -import org.bouncycastle.openpgp.PGPKeyPair; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.joda.time.DateTime; -import org.junit.Rule; -import org.junit.experimental.theories.DataPoints; -import org.junit.experimental.theories.Theories; -import org.junit.experimental.theories.Theory; -import org.junit.runner.RunWith; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -47,6 +36,14 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; +import org.bouncycastle.openpgp.PGPKeyPair; +import org.bouncycastle.openpgp.PGPPublicKey; +import org.joda.time.DateTime; +import org.junit.Rule; +import org.junit.experimental.theories.DataPoints; +import org.junit.experimental.theories.Theories; +import org.junit.experimental.theories.Theory; +import org.junit.runner.RunWith; /** GPG combinatorial integration tests for the Ryde classes. */ @RunWith(Theories.class) diff --git a/javatests/google/registry/rde/XjcToContactResourceConverterTest.java b/javatests/google/registry/rde/XjcToContactResourceConverterTest.java index 5df0482bd..8f7905f7d 100644 --- a/javatests/google/registry/rde/XjcToContactResourceConverterTest.java +++ b/javatests/google/registry/rde/XjcToContactResourceConverterTest.java @@ -32,7 +32,6 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.testing.DatastoreHelper.createTld; import com.google.common.io.ByteSource; - import google.registry.model.contact.ContactResource; import google.registry.model.contact.PostalInfo; import google.registry.model.eppcommon.StatusValue; @@ -42,24 +41,21 @@ import google.registry.testing.AppEngineRule; import google.registry.xjc.XjcXmlTransformer; import google.registry.xjc.rdecontact.XjcRdeContact; import google.registry.xjc.rdecontact.XjcRdeContactElement; - -import org.joda.time.DateTime; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; - import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.stax.StAXSource; import javax.xml.transform.stream.StreamResult; +import org.joda.time.DateTime; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class XjcToContactResourceConverterTest { diff --git a/javatests/google/registry/request/JsonResponseTest.java b/javatests/google/registry/request/JsonResponseTest.java index dd1eb9b75..53bfffcba 100644 --- a/javatests/google/registry/request/JsonResponseTest.java +++ b/javatests/google/registry/request/JsonResponseTest.java @@ -18,18 +18,15 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.request.JsonResponse.JSON_SAFETY_PREFIX; import com.google.common.collect.ImmutableMap; - import google.registry.testing.ExceptionRule; import google.registry.testing.FakeResponse; - +import java.util.Map; import org.json.simple.JSONValue; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.Map; - /** Unit tests for {@link JsonResponse}. */ @RunWith(JUnit4.class) public class JsonResponseTest { diff --git a/javatests/google/registry/request/RequestHandlerTest.java b/javatests/google/registry/request/RequestHandlerTest.java index aa8a1c493..8a61e53bf 100644 --- a/javatests/google/registry/request/RequestHandlerTest.java +++ b/javatests/google/registry/request/RequestHandlerTest.java @@ -26,12 +26,14 @@ import static org.mockito.Mockito.when; import com.google.appengine.api.users.UserService; import com.google.common.collect.ImmutableList; import com.google.common.testing.NullPointerTester; - import google.registry.request.HttpException.ServiceUnavailableException; import google.registry.testing.AppEngineRule; import google.registry.testing.InjectRule; import google.registry.testing.UserInfo; - +import java.io.PrintWriter; +import java.io.StringWriter; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -40,12 +42,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import java.io.PrintWriter; -import java.io.StringWriter; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** Unit tests for {@link RequestHandler}. */ @RunWith(MockitoJUnitRunner.class) public final class RequestHandlerTest { diff --git a/javatests/google/registry/request/RequestModuleTest.java b/javatests/google/registry/request/RequestModuleTest.java index 55c07702d..1ec4ad0f4 100644 --- a/javatests/google/registry/request/RequestModuleTest.java +++ b/javatests/google/registry/request/RequestModuleTest.java @@ -18,11 +18,9 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.request.RequestModule.provideJsonPayload; import com.google.common.net.MediaType; - import google.registry.request.HttpException.BadRequestException; import google.registry.request.HttpException.UnsupportedMediaTypeException; import google.registry.testing.ExceptionRule; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/request/RequestParametersTest.java b/javatests/google/registry/request/RequestParametersTest.java index 84a5d278e..78536b267 100644 --- a/javatests/google/registry/request/RequestParametersTest.java +++ b/javatests/google/registry/request/RequestParametersTest.java @@ -25,10 +25,9 @@ import static google.registry.request.RequestParameters.extractRequiredParameter import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; - import google.registry.request.HttpException.BadRequestException; import google.registry.testing.ExceptionRule; - +import javax.servlet.http.HttpServletRequest; import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; @@ -36,8 +35,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import javax.servlet.http.HttpServletRequest; - /** Unit tests for {@link RequestParameters}. */ @RunWith(MockitoJUnitRunner.class) public class RequestParametersTest { diff --git a/javatests/google/registry/request/ResponseImplTest.java b/javatests/google/registry/request/ResponseImplTest.java index fd9cc1253..ca842f478 100644 --- a/javatests/google/registry/request/ResponseImplTest.java +++ b/javatests/google/registry/request/ResponseImplTest.java @@ -21,18 +21,15 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import google.registry.testing.ExceptionRule; - +import java.io.PrintWriter; +import java.io.StringWriter; +import javax.servlet.http.HttpServletResponse; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import java.io.PrintWriter; -import java.io.StringWriter; - -import javax.servlet.http.HttpServletResponse; - /** Unit tests for {@link ResponseImpl}. */ @RunWith(MockitoJUnitRunner.class) public class ResponseImplTest { diff --git a/javatests/google/registry/request/RouterTest.java b/javatests/google/registry/request/RouterTest.java index 989900acf..e2ceeba01 100644 --- a/javatests/google/registry/request/RouterTest.java +++ b/javatests/google/registry/request/RouterTest.java @@ -19,16 +19,13 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; - import google.registry.testing.ExceptionRule; - +import java.util.concurrent.Callable; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.concurrent.Callable; - /** Unit tests for {@link Router}. */ @RunWith(JUnit4.class) public final class RouterTest { diff --git a/javatests/google/registry/security/JsonHttpTest.java b/javatests/google/registry/security/JsonHttpTest.java index e37edd754..063b55338 100644 --- a/javatests/google/registry/security/JsonHttpTest.java +++ b/javatests/google/registry/security/JsonHttpTest.java @@ -25,19 +25,16 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; - import java.io.BufferedReader; import java.io.PrintWriter; import java.io.StringReader; import java.io.StringWriter; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.runners.MockitoJUnitRunner; /** Unit tests for {@link JsonHttp}. */ @RunWith(MockitoJUnitRunner.class) diff --git a/javatests/google/registry/security/JsonHttpTestUtils.java b/javatests/google/registry/security/JsonHttpTestUtils.java index 08a104852..f18779c2e 100644 --- a/javatests/google/registry/security/JsonHttpTestUtils.java +++ b/javatests/google/registry/security/JsonHttpTestUtils.java @@ -20,14 +20,12 @@ import static com.google.common.truth.Truth.assert_; import static google.registry.security.JsonHttp.JSON_SAFETY_PREFIX; import com.google.common.base.Supplier; - -import org.json.simple.JSONValue; -import org.json.simple.parser.ParseException; - import java.io.BufferedReader; import java.io.StringReader; import java.io.StringWriter; import java.util.Map; +import org.json.simple.JSONValue; +import org.json.simple.parser.ParseException; /** * Helper class for testing JSON RPC servlets. diff --git a/javatests/google/registry/security/JsonTransportServletTest.java b/javatests/google/registry/security/JsonTransportServletTest.java index 49ae319e2..501ebcf6a 100644 --- a/javatests/google/registry/security/JsonTransportServletTest.java +++ b/javatests/google/registry/security/JsonTransportServletTest.java @@ -26,25 +26,21 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; - import google.registry.request.HttpException; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; - import java.io.BufferedReader; import java.io.PrintWriter; import java.io.StringReader; import java.io.StringWriter; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.runners.MockitoJUnitRunner; /** Unit tests for {@link JsonTransportServlet}. */ @RunWith(MockitoJUnitRunner.class) diff --git a/javatests/google/registry/security/XsrfProtectedServletTest.java b/javatests/google/registry/security/XsrfProtectedServletTest.java index 42848dfe8..a2aff08ec 100644 --- a/javatests/google/registry/security/XsrfProtectedServletTest.java +++ b/javatests/google/registry/security/XsrfProtectedServletTest.java @@ -25,7 +25,8 @@ import static org.mockito.Mockito.when; import google.registry.testing.AppEngineRule; import google.registry.testing.UserInfo; - +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -33,9 +34,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** Unit tests for {@link XsrfProtectedServlet}. */ @RunWith(MockitoJUnitRunner.class) public class XsrfProtectedServletTest { diff --git a/javatests/google/registry/security/XsrfTokenManagerTest.java b/javatests/google/registry/security/XsrfTokenManagerTest.java index f4b392f1b..dff96d4dc 100644 --- a/javatests/google/registry/security/XsrfTokenManagerTest.java +++ b/javatests/google/registry/security/XsrfTokenManagerTest.java @@ -20,12 +20,10 @@ import static google.registry.security.XsrfTokenManager.validateToken; import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.base.Splitter; - import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; import google.registry.testing.UserInfo; - import org.joda.time.Duration; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/server/Fixture.java b/javatests/google/registry/server/Fixture.java index 32efcc458..6b4c84cec 100644 --- a/javatests/google/registry/server/Fixture.java +++ b/javatests/google/registry/server/Fixture.java @@ -25,9 +25,7 @@ import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Ref; - import google.registry.model.contact.ContactAddress; import google.registry.model.contact.ContactResource; import google.registry.model.contact.PostalInfo; @@ -36,7 +34,6 @@ import google.registry.model.ofy.Ofy; import google.registry.model.registrar.Registrar; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; - import org.joda.time.DateTime; /** diff --git a/javatests/google/registry/server/HealthzServlet.java b/javatests/google/registry/server/HealthzServlet.java index 174d16e93..ee71a0d1a 100644 --- a/javatests/google/registry/server/HealthzServlet.java +++ b/javatests/google/registry/server/HealthzServlet.java @@ -18,7 +18,6 @@ import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8; import static javax.servlet.http.HttpServletResponse.SC_OK; import java.io.IOException; - import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/javatests/google/registry/server/RegistryTestServer.java b/javatests/google/registry/server/RegistryTestServer.java index bdcec0cc5..f27792d00 100644 --- a/javatests/google/registry/server/RegistryTestServer.java +++ b/javatests/google/registry/server/RegistryTestServer.java @@ -19,7 +19,6 @@ import static google.registry.server.Route.route; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.net.HostAndPort; - import java.net.URL; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/javatests/google/registry/server/RegistryTestServerMain.java b/javatests/google/registry/server/RegistryTestServerMain.java index b64d79250..5c32f2f8c 100644 --- a/javatests/google/registry/server/RegistryTestServerMain.java +++ b/javatests/google/registry/server/RegistryTestServerMain.java @@ -14,22 +14,18 @@ package google.registry.server; -import com.google.common.collect.ImmutableList; -import com.google.common.net.HostAndPort; - import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; - +import com.google.common.collect.ImmutableList; +import com.google.common.net.HostAndPort; import google.registry.testing.AppEngineRule; import google.registry.testing.UserInfo; import google.registry.tools.params.HostAndPortParameter; import google.registry.ui.ConsoleDebug; - +import java.util.List; import org.junit.runner.Description; import org.junit.runners.model.Statement; -import java.util.List; - /** Command-line interface for {@link RegistryTestServer}. */ public final class RegistryTestServerMain { diff --git a/javatests/google/registry/server/Route.java b/javatests/google/registry/server/Route.java index 7a3392d25..95d61f711 100644 --- a/javatests/google/registry/server/Route.java +++ b/javatests/google/registry/server/Route.java @@ -15,7 +15,6 @@ package google.registry.server; import com.google.auto.value.AutoValue; - import javax.servlet.http.HttpServlet; /** Pair of servlet path and servlet instance object. */ diff --git a/javatests/google/registry/server/ServletWrapperDelegatorServlet.java b/javatests/google/registry/server/ServletWrapperDelegatorServlet.java index 3476e9b6b..252ccef7e 100644 --- a/javatests/google/registry/server/ServletWrapperDelegatorServlet.java +++ b/javatests/google/registry/server/ServletWrapperDelegatorServlet.java @@ -20,13 +20,11 @@ import static com.google.common.base.Suppliers.memoize; import com.google.common.base.Supplier; import com.google.common.base.Throwables; import com.google.common.util.concurrent.Uninterruptibles; - import java.io.IOException; import java.util.Queue; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; - import javax.annotation.Nullable; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; diff --git a/javatests/google/registry/server/StaticResourceServlet.java b/javatests/google/registry/server/StaticResourceServlet.java index 6bebd4d30..4506d3d0d 100644 --- a/javatests/google/registry/server/StaticResourceServlet.java +++ b/javatests/google/registry/server/StaticResourceServlet.java @@ -25,21 +25,17 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; import com.google.common.primitives.Ints; - import google.registry.util.FormattingLogger; - -import org.mortbay.jetty.servlet.ServletHolder; - import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; - import javax.annotation.PostConstruct; import javax.servlet.ServletConfig; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.mortbay.jetty.servlet.ServletHolder; /** * Servlet for serving static resources on a Jetty development server path prefix. diff --git a/javatests/google/registry/server/TestServer.java b/javatests/google/registry/server/TestServer.java index 3a7c8fb08..e8b079d57 100644 --- a/javatests/google/registry/server/TestServer.java +++ b/javatests/google/registry/server/TestServer.java @@ -21,14 +21,6 @@ import com.google.common.base.Throwables; import com.google.common.net.HostAndPort; import com.google.common.util.concurrent.Callables; import com.google.common.util.concurrent.SimpleTimeLimiter; - -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.bio.SocketConnector; -import org.mortbay.jetty.servlet.Context; -import org.mortbay.jetty.servlet.DefaultServlet; -import org.mortbay.jetty.servlet.ServletHolder; - import java.net.MalformedURLException; import java.net.URL; import java.nio.file.Path; @@ -38,9 +30,14 @@ import java.util.concurrent.Callable; import java.util.concurrent.FutureTask; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; - import javax.annotation.Nullable; import javax.servlet.http.HttpServlet; +import org.mortbay.jetty.Connector; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.bio.SocketConnector; +import org.mortbay.jetty.servlet.Context; +import org.mortbay.jetty.servlet.DefaultServlet; +import org.mortbay.jetty.servlet.ServletHolder; /** * HTTP server that serves static content and handles servlet requests in the calling thread. diff --git a/javatests/google/registry/server/UrlChecker.java b/javatests/google/registry/server/UrlChecker.java index 786465a78..5b53e6263 100644 --- a/javatests/google/registry/server/UrlChecker.java +++ b/javatests/google/registry/server/UrlChecker.java @@ -16,13 +16,11 @@ package google.registry.server; import com.google.common.base.Throwables; import com.google.common.util.concurrent.SimpleTimeLimiter; - import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; - import javax.annotation.Nullable; final class UrlChecker { diff --git a/javatests/google/registry/storage/drive/DriveConnectionTest.java b/javatests/google/registry/storage/drive/DriveConnectionTest.java index fe686eb33..bc7fd8092 100644 --- a/javatests/google/registry/storage/drive/DriveConnectionTest.java +++ b/javatests/google/registry/storage/drive/DriveConnectionTest.java @@ -33,9 +33,9 @@ import com.google.api.services.drive.model.File; import com.google.api.services.drive.model.ParentReference; import com.google.common.collect.ImmutableList; import com.google.common.net.MediaType; - import google.registry.testing.ExceptionRule; - +import java.util.Arrays; +import java.util.List; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -44,9 +44,6 @@ import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import java.util.Arrays; -import java.util.List; - /** Tests for {@link DriveConnection}.*/ @RunWith(MockitoJUnitRunner.class) public class DriveConnectionTest { diff --git a/javatests/google/registry/testing/AbstractDomainBaseSubject.java b/javatests/google/registry/testing/AbstractDomainBaseSubject.java index b7b401583..2a1f5794b 100644 --- a/javatests/google/registry/testing/AbstractDomainBaseSubject.java +++ b/javatests/google/registry/testing/AbstractDomainBaseSubject.java @@ -16,14 +16,12 @@ package google.registry.testing; import com.google.common.collect.ImmutableSet; import com.google.common.truth.FailureStrategy; - import google.registry.model.domain.DomainBase; import google.registry.model.domain.DomainResource; import google.registry.model.domain.launch.LaunchNotice; import google.registry.model.domain.secdns.DelegationSignerData; import google.registry.model.eppcommon.AuthInfo; import google.registry.testing.TruthChainer.And; - import java.util.Set; /** Truth subject for asserting things about {@link DomainResource} instances. */ diff --git a/javatests/google/registry/testing/AbstractEppResourceSubject.java b/javatests/google/registry/testing/AbstractEppResourceSubject.java index 3895112af..f97c238ba 100644 --- a/javatests/google/registry/testing/AbstractEppResourceSubject.java +++ b/javatests/google/registry/testing/AbstractEppResourceSubject.java @@ -23,18 +23,15 @@ import static google.registry.testing.HistoryEntrySubject.assertAboutHistoryEntr import com.google.common.collect.ImmutableSet; import com.google.common.truth.FailureStrategy; import com.google.common.truth.Subject; - import google.registry.model.EppResource; import google.registry.model.eppcommon.StatusValue; import google.registry.model.reporting.HistoryEntry; import google.registry.model.transfer.TransferStatus; import google.registry.testing.TruthChainer.And; import google.registry.testing.TruthChainer.Which; - -import org.joda.time.DateTime; - import java.util.List; import java.util.Objects; +import org.joda.time.DateTime; /** Base Truth subject for asserting things about epp resources. */ abstract class AbstractEppResourceSubject diff --git a/javatests/google/registry/testing/AppEngineRule.java b/javatests/google/registry/testing/AppEngineRule.java index 9d1e2c20c..339b8e439 100644 --- a/javatests/google/registry/testing/AppEngineRule.java +++ b/javatests/google/registry/testing/AppEngineRule.java @@ -33,16 +33,21 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.common.io.Files; - import com.googlecode.objectify.ObjectifyFilter; - import google.registry.model.ofy.ObjectifyService; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.Registrar.State; import google.registry.model.registrar.RegistrarAddress; import google.registry.model.registrar.RegistrarContact; import google.registry.util.Clock; - +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.logging.LogManager; +import javax.annotation.Nullable; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -53,16 +58,6 @@ import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.IOException; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.logging.LogManager; - -import javax.annotation.Nullable; - /** * JUnit Rule for managing the App Engine testing environment. * diff --git a/javatests/google/registry/testing/BouncyCastleProviderRule.java b/javatests/google/registry/testing/BouncyCastleProviderRule.java index ee9ce4265..aa4383129 100644 --- a/javatests/google/registry/testing/BouncyCastleProviderRule.java +++ b/javatests/google/registry/testing/BouncyCastleProviderRule.java @@ -14,11 +14,10 @@ package google.registry.testing; +import java.security.Security; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.junit.rules.ExternalResource; -import java.security.Security; - /** * JUnit Rule for registering {@link BouncyCastleProvider} with Java Security. * diff --git a/javatests/google/registry/testing/ContactResourceSubject.java b/javatests/google/registry/testing/ContactResourceSubject.java index 64617abf8..931cd5186 100644 --- a/javatests/google/registry/testing/ContactResourceSubject.java +++ b/javatests/google/registry/testing/ContactResourceSubject.java @@ -19,7 +19,6 @@ import static com.google.common.truth.Truth.assertAbout; import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; - import google.registry.model.contact.ContactResource; import google.registry.model.contact.PostalInfo; import google.registry.model.eppcommon.AuthInfo; diff --git a/javatests/google/registry/testing/DatastoreHelper.java b/javatests/google/registry/testing/DatastoreHelper.java index dfe6fdf86..a4ef02327 100644 --- a/javatests/google/registry/testing/DatastoreHelper.java +++ b/javatests/google/registry/testing/DatastoreHelper.java @@ -46,13 +46,11 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Iterables; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.Work; import com.googlecode.objectify.cmd.Saver; - import google.registry.config.RegistryEnvironment; import google.registry.model.Buildable; import google.registry.model.EppResource; @@ -91,12 +89,10 @@ import google.registry.model.transfer.TransferData.Builder; import google.registry.model.transfer.TransferData.TransferServerApproveEntity; import google.registry.model.transfer.TransferStatus; import google.registry.tmch.LordnTask; - +import java.util.List; import org.joda.money.Money; import org.joda.time.DateTime; -import java.util.List; - /** Static utils for setting up test resources. */ public class DatastoreHelper { diff --git a/javatests/google/registry/testing/DomainApplicationSubject.java b/javatests/google/registry/testing/DomainApplicationSubject.java index c68dfb187..6de6786c2 100644 --- a/javatests/google/registry/testing/DomainApplicationSubject.java +++ b/javatests/google/registry/testing/DomainApplicationSubject.java @@ -21,12 +21,10 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableSet; import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; - import google.registry.model.domain.DomainApplication; import google.registry.model.domain.launch.ApplicationStatus; import google.registry.model.smd.EncodedSignedMark; import google.registry.testing.TruthChainer.And; - import java.util.Objects; /** Truth subject for asserting things about {@link DomainApplication} instances. */ diff --git a/javatests/google/registry/testing/DomainResourceSubject.java b/javatests/google/registry/testing/DomainResourceSubject.java index f71a73682..b8cdedd19 100644 --- a/javatests/google/registry/testing/DomainResourceSubject.java +++ b/javatests/google/registry/testing/DomainResourceSubject.java @@ -19,13 +19,10 @@ import static com.google.common.truth.Truth.assertAbout; import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; - import google.registry.model.domain.DomainResource; import google.registry.testing.TruthChainer.And; - -import org.joda.time.DateTime; - import java.util.Objects; +import org.joda.time.DateTime; /** Truth subject for asserting things about {@link DomainResource} instances. */ public final class DomainResourceSubject diff --git a/javatests/google/registry/testing/EppLoader.java b/javatests/google/registry/testing/EppLoader.java index e24c1681a..0180bf150 100644 --- a/javatests/google/registry/testing/EppLoader.java +++ b/javatests/google/registry/testing/EppLoader.java @@ -19,9 +19,7 @@ import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableMap; - import google.registry.model.eppinput.EppInput; - import java.util.Map; /** Test rule that loads an Epp object from a file. */ diff --git a/javatests/google/registry/testing/ExceptionRule.java b/javatests/google/registry/testing/ExceptionRule.java index 04e67e996..2e6c29af5 100644 --- a/javatests/google/registry/testing/ExceptionRule.java +++ b/javatests/google/registry/testing/ExceptionRule.java @@ -26,13 +26,11 @@ import google.registry.model.eppoutput.EppResponse; import google.registry.util.Clock; import google.registry.util.SystemClock; import google.registry.xml.ValidationMode; - +import javax.annotation.Nullable; import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; -import javax.annotation.Nullable; - /** * A test rule similar to JUnit's {@code ExpectedException} rule that does extra checking to ensure * that {@link EppException} derivatives have EPP-compliant error messages. diff --git a/javatests/google/registry/testing/FakeClock.java b/javatests/google/registry/testing/FakeClock.java index 11e939d39..78d5b454e 100644 --- a/javatests/google/registry/testing/FakeClock.java +++ b/javatests/google/registry/testing/FakeClock.java @@ -19,15 +19,12 @@ import static org.joda.time.DateTimeZone.UTC; import static org.joda.time.Duration.millis; import google.registry.util.Clock; - +import java.util.concurrent.atomic.AtomicLong; +import javax.annotation.concurrent.ThreadSafe; import org.joda.time.DateTime; import org.joda.time.ReadableDuration; import org.joda.time.ReadableInstant; -import java.util.concurrent.atomic.AtomicLong; - -import javax.annotation.concurrent.ThreadSafe; - /** A mock clock for testing purposes that supports telling, setting, and advancing the time. */ @ThreadSafe public final class FakeClock implements Clock { diff --git a/javatests/google/registry/testing/FakeHttpSession.java b/javatests/google/registry/testing/FakeHttpSession.java index f305b0de1..86268aac0 100644 --- a/javatests/google/registry/testing/FakeHttpSession.java +++ b/javatests/google/registry/testing/FakeHttpSession.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkState; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; - import javax.annotation.Nullable; import javax.servlet.ServletContext; import javax.servlet.http.HttpSession; diff --git a/javatests/google/registry/testing/FakeJsonResponse.java b/javatests/google/registry/testing/FakeJsonResponse.java index 9f5a8490f..0d6e28880 100644 --- a/javatests/google/registry/testing/FakeJsonResponse.java +++ b/javatests/google/registry/testing/FakeJsonResponse.java @@ -15,7 +15,6 @@ package google.registry.testing; import google.registry.request.JsonResponse; - import java.util.Map; /** Fake implementation of {@link JsonResponse} for testing. */ diff --git a/javatests/google/registry/testing/FakeResponse.java b/javatests/google/registry/testing/FakeResponse.java index c3c4a3616..458ff6d58 100644 --- a/javatests/google/registry/testing/FakeResponse.java +++ b/javatests/google/registry/testing/FakeResponse.java @@ -21,13 +21,10 @@ import static java.util.Collections.unmodifiableMap; import com.google.common.base.Throwables; import com.google.common.net.MediaType; - import google.registry.request.Response; - -import org.joda.time.DateTime; - import java.util.HashMap; import java.util.Map; +import org.joda.time.DateTime; /** Fake implementation of {@link Response} for testing. */ public final class FakeResponse implements Response { diff --git a/javatests/google/registry/testing/FakeServletInputStream.java b/javatests/google/registry/testing/FakeServletInputStream.java index 09cb09761..daf88a684 100644 --- a/javatests/google/registry/testing/FakeServletInputStream.java +++ b/javatests/google/registry/testing/FakeServletInputStream.java @@ -15,11 +15,9 @@ package google.registry.testing; import com.google.common.io.ByteSource; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; - import javax.servlet.ServletInputStream; /** diff --git a/javatests/google/registry/testing/FakeServletOutputStream.java b/javatests/google/registry/testing/FakeServletOutputStream.java index 639d79b52..fa957cfc3 100644 --- a/javatests/google/registry/testing/FakeServletOutputStream.java +++ b/javatests/google/registry/testing/FakeServletOutputStream.java @@ -19,7 +19,6 @@ import static java.nio.charset.StandardCharsets.UTF_8; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; - import javax.annotation.Nonnull; import javax.servlet.ServletOutputStream; diff --git a/javatests/google/registry/testing/FakeSleeper.java b/javatests/google/registry/testing/FakeSleeper.java index 5a48b23c5..9e7a6addd 100644 --- a/javatests/google/registry/testing/FakeSleeper.java +++ b/javatests/google/registry/testing/FakeSleeper.java @@ -18,10 +18,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import google.registry.util.Sleeper; - -import org.joda.time.ReadableDuration; - import javax.annotation.concurrent.ThreadSafe; +import org.joda.time.ReadableDuration; /** Sleeper implementation for unit tests that advances {@link FakeClock} rather than sleep. */ @ThreadSafe diff --git a/javatests/google/registry/testing/FakeURLFetchService.java b/javatests/google/registry/testing/FakeURLFetchService.java index a6bb0e9da..91b349571 100644 --- a/javatests/google/registry/testing/FakeURLFetchService.java +++ b/javatests/google/registry/testing/FakeURLFetchService.java @@ -19,7 +19,6 @@ import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.appengine.api.urlfetch.URLFetchService; import com.google.common.collect.ImmutableList; - import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; diff --git a/javatests/google/registry/testing/ForwardingURLFetchService.java b/javatests/google/registry/testing/ForwardingURLFetchService.java index cec3e7c39..5e056628c 100644 --- a/javatests/google/registry/testing/ForwardingURLFetchService.java +++ b/javatests/google/registry/testing/ForwardingURLFetchService.java @@ -18,7 +18,6 @@ import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.appengine.api.urlfetch.URLFetchService; import com.google.common.util.concurrent.Futures; - import java.io.IOException; import java.net.URL; import java.util.concurrent.Future; diff --git a/javatests/google/registry/testing/FullFieldsTestEntityHelper.java b/javatests/google/registry/testing/FullFieldsTestEntityHelper.java index 95989f921..7750c8f3e 100644 --- a/javatests/google/registry/testing/FullFieldsTestEntityHelper.java +++ b/javatests/google/registry/testing/FullFieldsTestEntityHelper.java @@ -23,9 +23,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; - import com.googlecode.objectify.Ref; - import google.registry.model.EppResource; import google.registry.model.contact.ContactAddress; import google.registry.model.contact.ContactPhoneNumber; @@ -43,13 +41,10 @@ import google.registry.model.registrar.RegistrarAddress; import google.registry.model.registrar.RegistrarContact; import google.registry.model.reporting.HistoryEntry; import google.registry.util.Idn; - -import org.joda.time.DateTime; - import java.net.InetAddress; import java.util.List; - import javax.annotation.Nullable; +import org.joda.time.DateTime; /** Test helper methods for the rdap and whois packages. */ public final class FullFieldsTestEntityHelper { diff --git a/javatests/google/registry/testing/GcsTestingUtils.java b/javatests/google/registry/testing/GcsTestingUtils.java index 3f86bed95..f23bbbe59 100644 --- a/javatests/google/registry/testing/GcsTestingUtils.java +++ b/javatests/google/registry/testing/GcsTestingUtils.java @@ -18,7 +18,6 @@ import com.google.appengine.tools.cloudstorage.GcsFileOptions; import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.appengine.tools.cloudstorage.GcsService; import com.google.common.io.ByteStreams; - import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; diff --git a/javatests/google/registry/testing/GenericEppResourceSubject.java b/javatests/google/registry/testing/GenericEppResourceSubject.java index bd6eb3a6d..8265c8995 100644 --- a/javatests/google/registry/testing/GenericEppResourceSubject.java +++ b/javatests/google/registry/testing/GenericEppResourceSubject.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertAbout; import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; import com.google.common.truth.SubjectFactory; - import google.registry.model.EppResource; /** Truth subject for asserting things about {@link EppResource} instances. */ diff --git a/javatests/google/registry/testing/GpgSystemCommandRule.java b/javatests/google/registry/testing/GpgSystemCommandRule.java index d3c55fb38..1334bc6d2 100644 --- a/javatests/google/registry/testing/GpgSystemCommandRule.java +++ b/javatests/google/registry/testing/GpgSystemCommandRule.java @@ -20,11 +20,9 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.truth.Truth.assertWithMessage; import com.google.common.io.ByteSource; - -import org.junit.rules.ExternalResource; - import java.io.File; import java.io.IOException; +import org.junit.rules.ExternalResource; /** * GnuPG system command JUnit rule. diff --git a/javatests/google/registry/testing/HistoryEntrySubject.java b/javatests/google/registry/testing/HistoryEntrySubject.java index 8536bb6c5..f340f2cef 100644 --- a/javatests/google/registry/testing/HistoryEntrySubject.java +++ b/javatests/google/registry/testing/HistoryEntrySubject.java @@ -20,11 +20,9 @@ import com.google.common.base.Optional; import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; import com.google.common.truth.Subject; - import google.registry.model.domain.Period; import google.registry.model.reporting.HistoryEntry; import google.registry.testing.TruthChainer.And; - import java.util.Objects; /** Utility methods for asserting things about {@link HistoryEntry} instances. */ diff --git a/javatests/google/registry/testing/HostResourceSubject.java b/javatests/google/registry/testing/HostResourceSubject.java index 75584d6c2..6c03f5467 100644 --- a/javatests/google/registry/testing/HostResourceSubject.java +++ b/javatests/google/registry/testing/HostResourceSubject.java @@ -19,7 +19,6 @@ import static com.google.common.truth.Truth.assertAbout; import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; - import google.registry.model.host.HostResource; /** Truth subject for asserting things about {@link HostResource} instances. */ diff --git a/javatests/google/registry/testing/InjectRule.java b/javatests/google/registry/testing/InjectRule.java index 4e450f35d..23a957f13 100644 --- a/javatests/google/registry/testing/InjectRule.java +++ b/javatests/google/registry/testing/InjectRule.java @@ -16,15 +16,13 @@ package google.registry.testing; import static com.google.common.base.Preconditions.checkState; -import org.junit.rules.ExternalResource; - import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; - import javax.annotation.Nullable; +import org.junit.rules.ExternalResource; /** * JUnit Rule for overriding {@code private static} fields during a test. diff --git a/javatests/google/registry/testing/IoSpyRule.java b/javatests/google/registry/testing/IoSpyRule.java index 434b18ef7..7c878a675 100644 --- a/javatests/google/registry/testing/IoSpyRule.java +++ b/javatests/google/registry/testing/IoSpyRule.java @@ -23,16 +23,14 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import org.junit.rules.ExternalResource; - import java.io.Closeable; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; import java.util.List; - import javax.annotation.CheckReturnValue; +import org.junit.rules.ExternalResource; /** JUnit Rule that uses Mockito to spy on I/O streams to make sure they're healthy. */ public final class IoSpyRule extends ExternalResource { diff --git a/javatests/google/registry/testing/LogsSubject.java b/javatests/google/registry/testing/LogsSubject.java index 4c5ff8d6c..b6094dcea 100644 --- a/javatests/google/registry/testing/LogsSubject.java +++ b/javatests/google/registry/testing/LogsSubject.java @@ -20,9 +20,7 @@ import com.google.common.testing.TestLogHandler; import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; import com.google.common.truth.Subject; - import google.registry.testing.TruthChainer.And; - import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.LogRecord; diff --git a/javatests/google/registry/testing/ReflectiveSubjectFactory.java b/javatests/google/registry/testing/ReflectiveSubjectFactory.java index 0713e87cf..ec46bcdf0 100644 --- a/javatests/google/registry/testing/ReflectiveSubjectFactory.java +++ b/javatests/google/registry/testing/ReflectiveSubjectFactory.java @@ -17,7 +17,6 @@ package google.registry.testing; import com.google.common.truth.FailureStrategy; import com.google.common.truth.Subject; import com.google.common.truth.SubjectFactory; - import google.registry.util.TypeUtils.TypeInstantiator; /** Helper to reduce boilerplate in making new Truth subject classes. */ diff --git a/javatests/google/registry/testing/RegistryConfigRule.java b/javatests/google/registry/testing/RegistryConfigRule.java index 786772edf..432372f33 100644 --- a/javatests/google/registry/testing/RegistryConfigRule.java +++ b/javatests/google/registry/testing/RegistryConfigRule.java @@ -17,11 +17,9 @@ package google.registry.testing; import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.Optional; - import google.registry.config.RegistryConfig; import google.registry.config.RegistryEnvironment; import google.registry.config.TestRegistryConfig; - import org.junit.rules.ExternalResource; /** JUnit Rule for overriding Domain Registry configuration values. */ diff --git a/javatests/google/registry/testing/SlurpAnswer.java b/javatests/google/registry/testing/SlurpAnswer.java index efd161294..4ea3c03c2 100644 --- a/javatests/google/registry/testing/SlurpAnswer.java +++ b/javatests/google/registry/testing/SlurpAnswer.java @@ -14,11 +14,10 @@ package google.registry.testing; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; - import java.io.ByteArrayOutputStream; import java.nio.ByteBuffer; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; /** Utility class for capturing channel output bytes from google cloud storage library mock. */ public final class SlurpAnswer implements Answer { diff --git a/javatests/google/registry/testing/SystemInfo.java b/javatests/google/registry/testing/SystemInfo.java index 004b18685..1d38192dc 100644 --- a/javatests/google/registry/testing/SystemInfo.java +++ b/javatests/google/registry/testing/SystemInfo.java @@ -17,12 +17,9 @@ package google.registry.testing; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; - import google.registry.util.FormattingLogger; - import java.io.IOException; import java.util.concurrent.ExecutionException; - import javax.annotation.concurrent.ThreadSafe; /** Utility class for getting system information in tests. */ diff --git a/javatests/google/registry/testing/SystemPropertyRule.java b/javatests/google/registry/testing/SystemPropertyRule.java index 9fb6b5c0a..687781ae0 100644 --- a/javatests/google/registry/testing/SystemPropertyRule.java +++ b/javatests/google/registry/testing/SystemPropertyRule.java @@ -18,15 +18,12 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import com.google.common.base.Optional; - -import org.junit.rules.ExternalResource; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.annotation.Nullable; +import org.junit.rules.ExternalResource; /** * JUnit Rule for overriding the values Java system properties during tests. diff --git a/javatests/google/registry/testing/TaskQueueHelper.java b/javatests/google/registry/testing/TaskQueueHelper.java index 26b136c36..d2c786ae5 100644 --- a/javatests/google/registry/testing/TaskQueueHelper.java +++ b/javatests/google/registry/testing/TaskQueueHelper.java @@ -42,11 +42,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.net.HttpHeaders; import com.google.common.net.MediaType; - import google.registry.dns.DnsConstants; - -import org.joda.time.Duration; - import java.net.URI; import java.util.Arrays; import java.util.Collections; @@ -56,8 +52,8 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; import java.util.Objects; - import javax.annotation.Nonnull; +import org.joda.time.Duration; /** Static utility functions for testing task queues. */ public class TaskQueueHelper { diff --git a/javatests/google/registry/testing/TestObject.java b/javatests/google/registry/testing/TestObject.java index f3940cdd7..78dec199d 100644 --- a/javatests/google/registry/testing/TestObject.java +++ b/javatests/google/registry/testing/TestObject.java @@ -20,7 +20,6 @@ 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.common.EntityGroupRoot; diff --git a/javatests/google/registry/testing/UriParameters.java b/javatests/google/registry/testing/UriParameters.java index 903207c32..403bf4199 100644 --- a/javatests/google/registry/testing/UriParameters.java +++ b/javatests/google/registry/testing/UriParameters.java @@ -19,7 +19,6 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; - import java.io.UnsupportedEncodingException; import java.net.URLDecoder; diff --git a/javatests/google/registry/testing/mapreduce/MapreduceTestCase.java b/javatests/google/registry/testing/mapreduce/MapreduceTestCase.java index f76a8687c..de3c2908b 100644 --- a/javatests/google/registry/testing/mapreduce/MapreduceTestCase.java +++ b/javatests/google/registry/testing/mapreduce/MapreduceTestCase.java @@ -32,14 +32,9 @@ import com.google.appengine.tools.pipeline.impl.servlets.PipelineServlet; import com.google.appengine.tools.pipeline.impl.servlets.TaskHandler; import com.google.apphosting.api.ApiProxy; import com.google.common.base.CharMatcher; - import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.util.FormattingLogger; - -import org.junit.Before; -import org.junit.Rule; - import java.io.ByteArrayInputStream; import java.io.ObjectInputStream; import java.io.UnsupportedEncodingException; @@ -48,10 +43,11 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.annotation.Nullable; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.junit.Before; +import org.junit.Rule; /** * Base test class for mapreduces. Adapted from EndToEndTestCase with some modifications that diff --git a/javatests/google/registry/testing/sftp/SftpServerRule.java b/javatests/google/registry/testing/sftp/SftpServerRule.java index 8dbb0c5eb..d2a49aa2b 100644 --- a/javatests/google/registry/testing/sftp/SftpServerRule.java +++ b/javatests/google/registry/testing/sftp/SftpServerRule.java @@ -17,16 +17,13 @@ package google.registry.testing.sftp; import static com.google.common.base.Preconditions.checkState; import google.registry.util.NetworkUtils; - +import java.io.File; +import java.io.IOException; +import javax.annotation.Nullable; import org.apache.ftpserver.FtpServer; import org.apache.ftpserver.ftplet.FtpException; import org.junit.rules.ExternalResource; -import java.io.File; -import java.io.IOException; - -import javax.annotation.Nullable; - /** * JUnit Rule for creating an in-process {@link TestSftpServer SFTP Server}. * diff --git a/javatests/google/registry/testing/sftp/TestSftpServer.java b/javatests/google/registry/testing/sftp/TestSftpServer.java index f1d69cce8..f6f321b3e 100644 --- a/javatests/google/registry/testing/sftp/TestSftpServer.java +++ b/javatests/google/registry/testing/sftp/TestSftpServer.java @@ -16,7 +16,16 @@ package google.registry.testing.sftp; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - +import java.io.File; +import java.io.IOException; +import java.io.StringReader; +import java.security.KeyPair; +import java.security.PublicKey; +import java.security.Security; +import java.util.Arrays; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.annotation.Nullable; import org.apache.ftpserver.FtpServer; import org.apache.ftpserver.ftplet.FtpException; import org.apache.sshd.common.NamedFactory; @@ -36,18 +45,6 @@ import org.bouncycastle.openssl.PEMKeyPair; import org.bouncycastle.openssl.PEMParser; import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter; -import java.io.File; -import java.io.IOException; -import java.io.StringReader; -import java.security.KeyPair; -import java.security.PublicKey; -import java.security.Security; -import java.util.Arrays; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.annotation.Nullable; - /** In-process SFTP server using Apache SSHD. */ public class TestSftpServer implements FtpServer { diff --git a/javatests/google/registry/tldconfig/idn/IdnLabelValidatorTest.java b/javatests/google/registry/tldconfig/idn/IdnLabelValidatorTest.java index 51ce242f0..3f1851a24 100644 --- a/javatests/google/registry/tldconfig/idn/IdnLabelValidatorTest.java +++ b/javatests/google/registry/tldconfig/idn/IdnLabelValidatorTest.java @@ -19,9 +19,7 @@ import static google.registry.tldconfig.idn.IdnLabelValidator.findValidIdnTableF import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import google.registry.testing.InjectRule; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/tldconfig/idn/IdnTableTest.java b/javatests/google/registry/tldconfig/idn/IdnTableTest.java index 2ed07de3c..b065e6057 100644 --- a/javatests/google/registry/tldconfig/idn/IdnTableTest.java +++ b/javatests/google/registry/tldconfig/idn/IdnTableTest.java @@ -18,16 +18,13 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; - import google.registry.testing.ExceptionRule; - +import java.net.URI; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.net.URI; - /** Unit tests for {@link IdnTable}. */ @RunWith(JUnit4.class) public class IdnTableTest { diff --git a/javatests/google/registry/tmch/LordnLogTest.java b/javatests/google/registry/tmch/LordnLogTest.java index 3a8739636..0ac9901a9 100644 --- a/javatests/google/registry/tmch/LordnLogTest.java +++ b/javatests/google/registry/tmch/LordnLogTest.java @@ -17,19 +17,16 @@ package google.registry.tmch; import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; - import google.registry.testing.ExceptionRule; import google.registry.tmch.LordnLog.Result; - +import java.util.List; +import java.util.Map.Entry; import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.List; -import java.util.Map.Entry; - /** Unit tests for {@link LordnLog}. */ @RunWith(JUnit4.class) public class LordnLogTest { diff --git a/javatests/google/registry/tmch/LordnTaskTest.java b/javatests/google/registry/tmch/LordnTaskTest.java index f617795a0..25ac7a485 100644 --- a/javatests/google/registry/tmch/LordnTaskTest.java +++ b/javatests/google/registry/tmch/LordnTaskTest.java @@ -32,10 +32,8 @@ import com.google.appengine.api.taskqueue.TaskOptions.Method; import com.google.appengine.api.taskqueue.TransientFailureException; import com.google.apphosting.api.DeadlineExceededException; import com.google.common.collect.ImmutableList; - import com.googlecode.objectify.Ref; import com.googlecode.objectify.VoidWork; - import google.registry.model.domain.DomainResource; import google.registry.model.domain.launch.LaunchNotice; import google.registry.model.ofy.Ofy; @@ -47,7 +45,7 @@ import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; import google.registry.testing.TaskQueueHelper.TaskMatcher; import google.registry.util.Clock; - +import java.util.List; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; @@ -55,8 +53,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; -import java.util.List; - /** Unit tests for {@link LordnTask}. */ @RunWith(MockitoJUnitRunner.class) public class LordnTaskTest { diff --git a/javatests/google/registry/tmch/NordnUploadActionTest.java b/javatests/google/registry/tmch/NordnUploadActionTest.java index c23c44d59..4cade8ace 100644 --- a/javatests/google/registry/tmch/NordnUploadActionTest.java +++ b/javatests/google/registry/tmch/NordnUploadActionTest.java @@ -39,7 +39,6 @@ import com.google.appengine.api.urlfetch.URLFetchService; import com.google.common.base.Optional; import com.google.common.base.VerifyException; import com.google.common.collect.ImmutableList; - import google.registry.model.domain.DomainResource; import google.registry.model.domain.launch.LaunchNotice; import google.registry.model.ofy.Ofy; @@ -51,7 +50,7 @@ import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; import google.registry.testing.TaskQueueHelper.TaskMatcher; import google.registry.util.UrlFetchException; - +import java.net.URL; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; @@ -62,8 +61,6 @@ import org.mockito.Captor; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import java.net.URL; - /** Unit tests for {@link NordnUploadAction}. */ @RunWith(MockitoJUnitRunner.class) public class NordnUploadActionTest { diff --git a/javatests/google/registry/tmch/NordnVerifyActionTest.java b/javatests/google/registry/tmch/NordnVerifyActionTest.java index 602b33db1..31b227f80 100644 --- a/javatests/google/registry/tmch/NordnVerifyActionTest.java +++ b/javatests/google/registry/tmch/NordnVerifyActionTest.java @@ -31,13 +31,12 @@ import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.appengine.api.urlfetch.URLFetchService; import com.google.common.base.Optional; - import google.registry.model.registry.Registry; import google.registry.request.HttpException.ConflictException; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeResponse; - +import java.net.URL; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -47,8 +46,6 @@ import org.mockito.Captor; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import java.net.URL; - /** Unit tests for {@link NordnVerifyAction}. */ @RunWith(MockitoJUnitRunner.class) public class NordnVerifyActionTest { diff --git a/javatests/google/registry/tmch/SmdrlCsvParserTest.java b/javatests/google/registry/tmch/SmdrlCsvParserTest.java index 3e1c75fa7..40827d59d 100644 --- a/javatests/google/registry/tmch/SmdrlCsvParserTest.java +++ b/javatests/google/registry/tmch/SmdrlCsvParserTest.java @@ -21,12 +21,10 @@ import static org.joda.time.Duration.standardDays; import com.google.common.collect.ImmutableList; import com.google.common.io.CharSource; - import google.registry.model.smd.SignedMarkRevocationList; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; - import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/tmch/TmchActionTestCase.java b/javatests/google/registry/tmch/TmchActionTestCase.java index 663901386..646e38ec6 100644 --- a/javatests/google/registry/tmch/TmchActionTestCase.java +++ b/javatests/google/registry/tmch/TmchActionTestCase.java @@ -21,14 +21,12 @@ import static org.mockito.Mockito.when; import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.appengine.api.urlfetch.URLFetchService; - import google.registry.testing.AppEngineRule; import google.registry.testing.BouncyCastleProviderRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; import google.registry.testing.RegistryConfigRule; - import org.junit.Before; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/tmch/TmchCertificateAuthorityTest.java b/javatests/google/registry/tmch/TmchCertificateAuthorityTest.java index 33ed1c44c..a34803c07 100644 --- a/javatests/google/registry/tmch/TmchCertificateAuthorityTest.java +++ b/javatests/google/registry/tmch/TmchCertificateAuthorityTest.java @@ -24,7 +24,10 @@ import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; import google.registry.testing.RegistryConfigRule; - +import java.security.SignatureException; +import java.security.cert.CertificateExpiredException; +import java.security.cert.CertificateNotYetValidException; +import java.security.cert.CertificateRevokedException; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; @@ -32,11 +35,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.security.SignatureException; -import java.security.cert.CertificateExpiredException; -import java.security.cert.CertificateNotYetValidException; -import java.security.cert.CertificateRevokedException; - /** Unit tests for {@link TmchCertificateAuthority}. */ @RunWith(JUnit4.class) public class TmchCertificateAuthorityTest { diff --git a/javatests/google/registry/tmch/TmchCrlActionTest.java b/javatests/google/registry/tmch/TmchCrlActionTest.java index a42e1d33e..db88f4e39 100644 --- a/javatests/google/registry/tmch/TmchCrlActionTest.java +++ b/javatests/google/registry/tmch/TmchCrlActionTest.java @@ -19,14 +19,13 @@ import static google.registry.util.ResourceUtils.readResourceBytes; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import org.joda.time.DateTime; -import org.junit.Test; - import java.net.MalformedURLException; import java.net.URL; import java.security.SignatureException; import java.security.cert.CRLException; import java.security.cert.CertificateNotYetValidException; +import org.joda.time.DateTime; +import org.junit.Test; /** Unit tests for {@link TmchCrlAction}. */ public class TmchCrlActionTest extends TmchActionTestCase { diff --git a/javatests/google/registry/tmch/TmchDnlActionTest.java b/javatests/google/registry/tmch/TmchDnlActionTest.java index 340897aa4..0c7cabd0b 100644 --- a/javatests/google/registry/tmch/TmchDnlActionTest.java +++ b/javatests/google/registry/tmch/TmchDnlActionTest.java @@ -20,9 +20,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.base.Optional; - import google.registry.model.tmch.ClaimsListShard; - import org.joda.time.DateTime; import org.junit.Test; diff --git a/javatests/google/registry/tmch/TmchSmdrlActionTest.java b/javatests/google/registry/tmch/TmchSmdrlActionTest.java index a5ea2ad9f..a872f0152 100644 --- a/javatests/google/registry/tmch/TmchSmdrlActionTest.java +++ b/javatests/google/registry/tmch/TmchSmdrlActionTest.java @@ -21,9 +21,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.base.Optional; - import google.registry.model.smd.SignedMarkRevocationList; - import org.joda.time.DateTime; import org.junit.Test; diff --git a/javatests/google/registry/tmch/TmchXmlSignatureTest.java b/javatests/google/registry/tmch/TmchXmlSignatureTest.java index d6f8c5844..a06a22131 100644 --- a/javatests/google/registry/tmch/TmchXmlSignatureTest.java +++ b/javatests/google/registry/tmch/TmchXmlSignatureTest.java @@ -21,7 +21,11 @@ import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; import google.registry.testing.RegistryConfigRule; - +import java.security.SignatureException; +import java.security.cert.CertificateExpiredException; +import java.security.cert.CertificateNotYetValidException; +import java.security.cert.CertificateRevokedException; +import javax.xml.crypto.dsig.XMLSignatureException; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; @@ -29,13 +33,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.security.SignatureException; -import java.security.cert.CertificateExpiredException; -import java.security.cert.CertificateNotYetValidException; -import java.security.cert.CertificateRevokedException; - -import javax.xml.crypto.dsig.XMLSignatureException; - /** * Unit tests for {@link TmchXmlSignature}. * diff --git a/javatests/google/registry/tools/AllocateDomainCommandTest.java b/javatests/google/registry/tools/AllocateDomainCommandTest.java index fde90e34c..b8f659ee4 100644 --- a/javatests/google/registry/tools/AllocateDomainCommandTest.java +++ b/javatests/google/registry/tools/AllocateDomainCommandTest.java @@ -33,11 +33,9 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.util.DateTimeUtils.START_OF_TIME; import static google.registry.util.ResourceUtils.readResourceBytes; -import com.google.common.collect.ImmutableSet; - import com.beust.jcommander.ParameterException; +import com.google.common.collect.ImmutableSet; import com.googlecode.objectify.Ref; - import google.registry.flows.domain.DomainAllocateFlow; import google.registry.model.domain.DesignatedContact; import google.registry.model.domain.DomainApplication; @@ -47,14 +45,12 @@ import google.registry.model.eppcommon.Trid; import google.registry.model.eppinput.EppInput; import google.registry.model.reporting.HistoryEntry; import google.registry.tools.ServerSideCommand.Connection; - +import java.io.IOException; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import java.io.IOException; - /** Unit tests for {@link AllocateDomainCommand}. */ public class AllocateDomainCommandTest extends CommandTestCase { diff --git a/javatests/google/registry/tools/CommandTestCase.java b/javatests/google/registry/tools/CommandTestCase.java index bf3cb83e3..80ec46f14 100644 --- a/javatests/google/registry/tools/CommandTestCase.java +++ b/javatests/google/registry/tools/CommandTestCase.java @@ -18,32 +18,28 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.model.ofy.ObjectifyService.ofy; import static java.nio.charset.StandardCharsets.UTF_8; +import com.beust.jcommander.JCommander; import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.FluentIterable; import com.google.common.collect.ObjectArrays; import com.google.common.io.Files; import com.google.common.reflect.TypeToken; - -import com.beust.jcommander.JCommander; - import google.registry.model.poll.PollMessage; import google.registry.testing.AppEngineRule; import google.registry.testing.CertificateSamples; import google.registry.testing.ExceptionRule; import google.registry.tools.params.ParameterFactory; - -import org.junit.Before; -import org.junit.Rule; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; - import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.PrintStream; import java.util.List; +import org.junit.Before; +import org.junit.Rule; +import org.junit.rules.TemporaryFolder; +import org.junit.runner.RunWith; +import org.mockito.runners.MockitoJUnitRunner; /** * Base class for all command tests. diff --git a/javatests/google/registry/tools/CreateAnchorTenantCommandTest.java b/javatests/google/registry/tools/CreateAnchorTenantCommandTest.java index cdd465220..6db43779e 100644 --- a/javatests/google/registry/tools/CreateAnchorTenantCommandTest.java +++ b/javatests/google/registry/tools/CreateAnchorTenantCommandTest.java @@ -19,9 +19,7 @@ import static google.registry.testing.DatastoreHelper.persistPremiumList; import static google.registry.testing.DatastoreHelper.persistResource; import com.beust.jcommander.ParameterException; - import google.registry.model.registry.Registry; - import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/CreateContactCommandTest.java b/javatests/google/registry/tools/CreateContactCommandTest.java index 4b7f4745b..55fc12836 100644 --- a/javatests/google/registry/tools/CreateContactCommandTest.java +++ b/javatests/google/registry/tools/CreateContactCommandTest.java @@ -15,7 +15,6 @@ package google.registry.tools; import com.beust.jcommander.ParameterException; - import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/CreateCreditBalanceCommandTest.java b/javatests/google/registry/tools/CreateCreditBalanceCommandTest.java index 1c7bde9e9..ed469edaa 100644 --- a/javatests/google/registry/tools/CreateCreditBalanceCommandTest.java +++ b/javatests/google/registry/tools/CreateCreditBalanceCommandTest.java @@ -22,17 +22,14 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.money.CurrencyUnit.USD; import static org.joda.time.DateTimeZone.UTC; -import com.google.common.collect.Range; - import com.beust.jcommander.ParameterException; +import com.google.common.collect.Range; import com.googlecode.objectify.Key; - import google.registry.model.billing.RegistrarCredit; import google.registry.model.billing.RegistrarCredit.CreditType; import google.registry.model.billing.RegistrarCreditBalance; import google.registry.model.registrar.Registrar; import google.registry.model.registry.Registry; - import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/CreateCreditCommandTest.java b/javatests/google/registry/tools/CreateCreditCommandTest.java index 1ed546f38..ae05b1f8a 100644 --- a/javatests/google/registry/tools/CreateCreditCommandTest.java +++ b/javatests/google/registry/tools/CreateCreditCommandTest.java @@ -21,16 +21,13 @@ import static google.registry.testing.DatastoreHelper.createTld; import static org.joda.money.CurrencyUnit.USD; import static org.joda.time.DateTimeZone.UTC; -import com.google.common.collect.Range; - import com.beust.jcommander.ParameterException; - +import com.google.common.collect.Range; import google.registry.model.billing.RegistrarCredit; import google.registry.model.billing.RegistrarCredit.CreditType; import google.registry.model.billing.RegistrarCreditBalance; import google.registry.model.registrar.Registrar; import google.registry.model.registry.Registry; - import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java b/javatests/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java index a247384a1..f8ef7022a 100644 --- a/javatests/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java +++ b/javatests/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java @@ -22,15 +22,12 @@ import static org.mockito.Mockito.verify; import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; import com.google.common.net.MediaType; - import google.registry.testing.UriParameters; import google.registry.tools.ServerSideCommand.Connection; - -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; - import java.io.File; import java.nio.charset.StandardCharsets; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; /** * Base class for common testing setup for create and update commands for Premium Lists. diff --git a/javatests/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java b/javatests/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java index 6948b540d..47aa96eec 100644 --- a/javatests/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java +++ b/javatests/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java @@ -17,15 +17,12 @@ package google.registry.tools; import static google.registry.util.ResourceUtils.readResourceUtf8; import static java.nio.charset.StandardCharsets.UTF_8; -import com.google.common.io.Files; - import com.beust.jcommander.ParameterException; - -import org.junit.Before; -import org.junit.Test; - +import com.google.common.io.Files; import java.io.File; import java.io.IOException; +import org.junit.Before; +import org.junit.Test; /** * Base class for common testing setup for create and update commands for Reserved Lists. diff --git a/javatests/google/registry/tools/CreatePremiumListCommandTest.java b/javatests/google/registry/tools/CreatePremiumListCommandTest.java index 707df8291..2a4ce1ef3 100644 --- a/javatests/google/registry/tools/CreatePremiumListCommandTest.java +++ b/javatests/google/registry/tools/CreatePremiumListCommandTest.java @@ -22,15 +22,12 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.when; +import com.beust.jcommander.ParameterException; import com.google.common.base.VerifyException; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; - -import com.beust.jcommander.ParameterException; - import google.registry.tools.ServerSideCommand.Connection; import google.registry.tools.server.CreatePremiumListAction; - import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/javatests/google/registry/tools/CreateRegistrarCommandTest.java b/javatests/google/registry/tools/CreateRegistrarCommandTest.java index 42807076a..5e70ba4a8 100644 --- a/javatests/google/registry/tools/CreateRegistrarCommandTest.java +++ b/javatests/google/registry/tools/CreateRegistrarCommandTest.java @@ -26,24 +26,20 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; +import com.beust.jcommander.ParameterException; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Range; import com.google.common.net.MediaType; - -import com.beust.jcommander.ParameterException; - import google.registry.model.registrar.Registrar; import google.registry.testing.CertificateSamples; import google.registry.tools.ServerSideCommand.Connection; - +import java.io.IOException; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import java.io.IOException; - /** Unit tests for {@link CreateRegistrarCommand}. */ public class CreateRegistrarCommandTest extends CommandTestCase { diff --git a/javatests/google/registry/tools/CreateRegistrarGroupsCommandTest.java b/javatests/google/registry/tools/CreateRegistrarGroupsCommandTest.java index 224d4ac14..9daf49a5e 100644 --- a/javatests/google/registry/tools/CreateRegistrarGroupsCommandTest.java +++ b/javatests/google/registry/tools/CreateRegistrarGroupsCommandTest.java @@ -19,9 +19,7 @@ import static org.mockito.Mockito.verify; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; - import google.registry.tools.ServerSideCommand.Connection; - import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/javatests/google/registry/tools/CreateReservedListCommandTest.java b/javatests/google/registry/tools/CreateReservedListCommandTest.java index 88b182619..a3f3f89a1 100644 --- a/javatests/google/registry/tools/CreateReservedListCommandTest.java +++ b/javatests/google/registry/tools/CreateReservedListCommandTest.java @@ -24,7 +24,6 @@ import static org.joda.time.DateTimeZone.UTC; import google.registry.model.registry.Registry; import google.registry.model.registry.label.ReservedList; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/CreateTldCommandTest.java b/javatests/google/registry/tools/CreateTldCommandTest.java index 7ba311799..6daed273d 100644 --- a/javatests/google/registry/tools/CreateTldCommandTest.java +++ b/javatests/google/registry/tools/CreateTldCommandTest.java @@ -26,21 +26,17 @@ import static org.joda.money.CurrencyUnit.USD; import static org.joda.time.DateTimeZone.UTC; import static org.joda.time.Duration.standardMinutes; -import com.google.common.collect.Range; - import com.beust.jcommander.ParameterException; - +import com.google.common.collect.Range; import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.TldState; - +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; - /** Unit tests for {@link CreateTldCommand}. */ public class CreateTldCommandTest extends CommandTestCase { diff --git a/javatests/google/registry/tools/DeleteCreditCommandTest.java b/javatests/google/registry/tools/DeleteCreditCommandTest.java index a1f8d55c2..371a2b40a 100644 --- a/javatests/google/registry/tools/DeleteCreditCommandTest.java +++ b/javatests/google/registry/tools/DeleteCreditCommandTest.java @@ -23,13 +23,11 @@ import static org.joda.money.CurrencyUnit.USD; import com.beust.jcommander.ParameterException; import com.googlecode.objectify.Key; - import google.registry.model.billing.RegistrarCredit; import google.registry.model.billing.RegistrarCredit.CreditType; import google.registry.model.billing.RegistrarCreditBalance; import google.registry.model.registrar.Registrar; import google.registry.model.registry.Registry; - import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/DeleteDomainCommandTest.java b/javatests/google/registry/tools/DeleteDomainCommandTest.java index c3923bb56..c239a7733 100644 --- a/javatests/google/registry/tools/DeleteDomainCommandTest.java +++ b/javatests/google/registry/tools/DeleteDomainCommandTest.java @@ -15,7 +15,6 @@ package google.registry.tools; import com.beust.jcommander.ParameterException; - import org.junit.Test; /** Unit tests for {@link DeleteDomainCommand}. */ diff --git a/javatests/google/registry/tools/DeleteEntityCommandTest.java b/javatests/google/registry/tools/DeleteEntityCommandTest.java index e818daace..2816e5a4a 100644 --- a/javatests/google/registry/tools/DeleteEntityCommandTest.java +++ b/javatests/google/registry/tools/DeleteEntityCommandTest.java @@ -23,9 +23,7 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; - import google.registry.tools.ServerSideCommand.Connection; - import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/javatests/google/registry/tools/DeletePremiumListCommandTest.java b/javatests/google/registry/tools/DeletePremiumListCommandTest.java index e0eba8e90..2da5b498a 100644 --- a/javatests/google/registry/tools/DeletePremiumListCommandTest.java +++ b/javatests/google/registry/tools/DeletePremiumListCommandTest.java @@ -23,7 +23,6 @@ import static google.registry.testing.DatastoreHelper.persistResource; import google.registry.model.registry.Registry; import google.registry.model.registry.label.PremiumList; import google.registry.model.registry.label.PremiumList.PremiumListEntry; - import org.junit.Test; /** Unit tests for {@link DeletePremiumListCommand}. */ diff --git a/javatests/google/registry/tools/DeleteReservedListCommandTest.java b/javatests/google/registry/tools/DeleteReservedListCommandTest.java index efdda6a02..d16af4bd0 100644 --- a/javatests/google/registry/tools/DeleteReservedListCommandTest.java +++ b/javatests/google/registry/tools/DeleteReservedListCommandTest.java @@ -21,7 +21,6 @@ import static google.registry.testing.DatastoreHelper.persistResource; import google.registry.model.registry.Registry; import google.registry.model.registry.label.ReservedList; - import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/DomainApplicationInfoCommandTest.java b/javatests/google/registry/tools/DomainApplicationInfoCommandTest.java index d853faaac..45c8625e0 100644 --- a/javatests/google/registry/tools/DomainApplicationInfoCommandTest.java +++ b/javatests/google/registry/tools/DomainApplicationInfoCommandTest.java @@ -15,7 +15,6 @@ package google.registry.tools; import com.beust.jcommander.ParameterException; - import org.junit.Test; /** Unit tests for {@link DomainApplicationInfoCommand}. */ diff --git a/javatests/google/registry/tools/DomainCheckClaimsCommandTest.java b/javatests/google/registry/tools/DomainCheckClaimsCommandTest.java index 67c7f18a1..6265fa363 100644 --- a/javatests/google/registry/tools/DomainCheckClaimsCommandTest.java +++ b/javatests/google/registry/tools/DomainCheckClaimsCommandTest.java @@ -15,7 +15,6 @@ package google.registry.tools; import com.beust.jcommander.ParameterException; - import org.junit.Test; /** Unit tests for {@link DomainCheckClaimsCommand}. */ diff --git a/javatests/google/registry/tools/DomainCheckCommandTest.java b/javatests/google/registry/tools/DomainCheckCommandTest.java index 1e82bacb0..0e8921d56 100644 --- a/javatests/google/registry/tools/DomainCheckCommandTest.java +++ b/javatests/google/registry/tools/DomainCheckCommandTest.java @@ -15,7 +15,6 @@ package google.registry.tools; import com.beust.jcommander.ParameterException; - import org.junit.Test; /** Unit tests for {@link DomainCheckCommand}. */ diff --git a/javatests/google/registry/tools/DomainCheckFeeCommandTest.java b/javatests/google/registry/tools/DomainCheckFeeCommandTest.java index 5e45087cf..aa0639d1b 100644 --- a/javatests/google/registry/tools/DomainCheckFeeCommandTest.java +++ b/javatests/google/registry/tools/DomainCheckFeeCommandTest.java @@ -15,7 +15,6 @@ package google.registry.tools; import com.beust.jcommander.ParameterException; - import org.junit.Test; /** Unit tests for {@link DomainCheckFeeCommand}. */ diff --git a/javatests/google/registry/tools/EncryptEscrowDepositCommandTest.java b/javatests/google/registry/tools/EncryptEscrowDepositCommandTest.java index 5a5aeb452..bd65d9b45 100644 --- a/javatests/google/registry/tools/EncryptEscrowDepositCommandTest.java +++ b/javatests/google/registry/tools/EncryptEscrowDepositCommandTest.java @@ -19,7 +19,6 @@ import static google.registry.util.ResourceUtils.readResourceBytes; import com.google.common.io.ByteSource; import com.google.common.io.Files; - import google.registry.rde.RdeKeyringModule; import google.registry.rde.RdeTestData; import google.registry.rde.RydePgpCompressionOutputStreamFactory; @@ -29,13 +28,11 @@ import google.registry.rde.RydePgpSigningOutputStreamFactory; import google.registry.rde.RydeTarOutputStreamFactory; import google.registry.testing.BouncyCastleProviderRule; import google.registry.testing.Providers; - +import java.io.File; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import java.io.File; - /** Unit tests for {@link EncryptEscrowDepositCommand}. */ public class EncryptEscrowDepositCommandTest extends CommandTestCase { diff --git a/javatests/google/registry/tools/EppToolCommandTest.java b/javatests/google/registry/tools/EppToolCommandTest.java index 4b83e54f2..88fb8736d 100644 --- a/javatests/google/registry/tools/EppToolCommandTest.java +++ b/javatests/google/registry/tools/EppToolCommandTest.java @@ -18,10 +18,8 @@ import static google.registry.util.ResourceUtils.readResourceUtf8; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - -import org.junit.Test; - import java.util.List; +import org.junit.Test; /** Unit tests for {@link EppToolCommand}. */ public class EppToolCommandTest extends EppToolCommandTestCase { diff --git a/javatests/google/registry/tools/EppToolCommandTestCase.java b/javatests/google/registry/tools/EppToolCommandTestCase.java index b7b6f9c7a..9b377b0bc 100644 --- a/javatests/google/registry/tools/EppToolCommandTestCase.java +++ b/javatests/google/registry/tools/EppToolCommandTestCase.java @@ -17,7 +17,6 @@ package google.registry.tools; import static google.registry.testing.DatastoreHelper.createTlds; import google.registry.tools.ServerSideCommand.Connection; - import org.junit.Before; import org.mockito.Mock; diff --git a/javatests/google/registry/tools/EppToolVerifier.java b/javatests/google/registry/tools/EppToolVerifier.java index 843fe9d3e..756d5fb5e 100644 --- a/javatests/google/registry/tools/EppToolVerifier.java +++ b/javatests/google/registry/tools/EppToolVerifier.java @@ -25,14 +25,11 @@ import static org.mockito.Mockito.verify; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; - import google.registry.tools.ServerSideCommand.Connection; - -import org.mockito.ArgumentCaptor; - import java.net.URLDecoder; import java.util.List; import java.util.Map; +import org.mockito.ArgumentCaptor; /** Class for verifying EPP commands sent to the server via the tool endpoint. */ public class EppToolVerifier { diff --git a/javatests/google/registry/tools/ExecuteEppCommandTest.java b/javatests/google/registry/tools/ExecuteEppCommandTest.java index d58c144e2..9dedd588d 100644 --- a/javatests/google/registry/tools/ExecuteEppCommandTest.java +++ b/javatests/google/registry/tools/ExecuteEppCommandTest.java @@ -18,15 +18,12 @@ import static google.registry.util.ResourceUtils.readResourceUtf8; import static java.nio.charset.StandardCharsets.UTF_8; import com.beust.jcommander.ParameterException; - import google.registry.testing.InjectRule; - +import java.io.ByteArrayInputStream; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import java.io.ByteArrayInputStream; - /** Unit tests for {@link ExecuteEppCommand}. */ public class ExecuteEppCommandTest extends EppToolCommandTestCase { diff --git a/javatests/google/registry/tools/FakePasswordGenerator.java b/javatests/google/registry/tools/FakePasswordGenerator.java index ad9cc8203..c757e696f 100644 --- a/javatests/google/registry/tools/FakePasswordGenerator.java +++ b/javatests/google/registry/tools/FakePasswordGenerator.java @@ -19,7 +19,6 @@ import static com.google.common.base.Strings.isNullOrEmpty; import static com.google.common.collect.Lists.charactersOf; import com.google.common.collect.Iterators; - import java.util.Iterator; /** A password generator that produces a password from a predefined string. */ diff --git a/javatests/google/registry/tools/GenerateAuctionDataCommandTest.java b/javatests/google/registry/tools/GenerateAuctionDataCommandTest.java index 58440f726..2e2cf96bf 100644 --- a/javatests/google/registry/tools/GenerateAuctionDataCommandTest.java +++ b/javatests/google/registry/tools/GenerateAuctionDataCommandTest.java @@ -23,11 +23,9 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.DateTimeZone.UTC; +import com.beust.jcommander.ParameterException; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; - -import com.beust.jcommander.ParameterException; - import google.registry.model.contact.ContactAddress; import google.registry.model.contact.ContactPhoneNumber; import google.registry.model.contact.ContactResource; @@ -36,18 +34,16 @@ import google.registry.model.domain.launch.ApplicationStatus; import google.registry.model.ofy.Ofy; import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; - +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; - /** Unit tests for {@link GenerateAuctionDataCommand}. */ public class GenerateAuctionDataCommandTest extends CommandTestCase { diff --git a/javatests/google/registry/tools/GenerateDnsReportCommandTest.java b/javatests/google/registry/tools/GenerateDnsReportCommandTest.java index cf7a56822..7d1957b37 100644 --- a/javatests/google/registry/tools/GenerateDnsReportCommandTest.java +++ b/javatests/google/registry/tools/GenerateDnsReportCommandTest.java @@ -25,20 +25,22 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.DateTimeZone.UTC; +import com.beust.jcommander.ParameterException; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; - -import com.beust.jcommander.ParameterException; import com.googlecode.objectify.Ref; - import google.registry.model.domain.DomainResource; import google.registry.model.domain.secdns.DelegationSignerData; import google.registry.model.eppcommon.StatusValue; import google.registry.model.host.HostResource; import google.registry.testing.FakeClock; - +import java.io.IOException; +import java.io.Reader; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import org.joda.time.DateTime; import org.json.simple.JSONValue; import org.json.simple.parser.ParseException; @@ -47,12 +49,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import java.io.IOException; -import java.io.Reader; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; - /** Unit tests for {@link GenerateDnsReportCommand}. */ public class GenerateDnsReportCommandTest extends CommandTestCase { diff --git a/javatests/google/registry/tools/GenerateEscrowDepositCommandTest.java b/javatests/google/registry/tools/GenerateEscrowDepositCommandTest.java index bbdc526c7..7128550a8 100644 --- a/javatests/google/registry/tools/GenerateEscrowDepositCommandTest.java +++ b/javatests/google/registry/tools/GenerateEscrowDepositCommandTest.java @@ -23,12 +23,10 @@ import static google.registry.util.ResourceUtils.readResourceUtf8; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Arrays.asList; +import com.beust.jcommander.ParameterException; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; - -import com.beust.jcommander.ParameterException; - import google.registry.config.TestRegistryConfig; import google.registry.model.eppcommon.StatusValue; import google.registry.model.host.HostResource; @@ -50,19 +48,16 @@ import google.registry.xjc.rdehost.XjcRdeHost; import google.registry.xjc.rderegistrar.XjcRdeRegistrar; import google.registry.xml.XmlException; import google.registry.xml.XmlTestUtils; - -import org.joda.time.DateTime; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; - import java.io.ByteArrayInputStream; import java.nio.file.Files; import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; - import javax.xml.bind.JAXBElement; +import org.joda.time.DateTime; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; /** Unit tests for {@link GenerateEscrowDepositCommand}. */ public class GenerateEscrowDepositCommandTest diff --git a/javatests/google/registry/tools/GetApplicationCommandTest.java b/javatests/google/registry/tools/GetApplicationCommandTest.java index 614f458d9..28a671648 100644 --- a/javatests/google/registry/tools/GetApplicationCommandTest.java +++ b/javatests/google/registry/tools/GetApplicationCommandTest.java @@ -22,7 +22,6 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.DateTimeZone.UTC; import com.beust.jcommander.ParameterException; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/GetApplicationIdsCommandTest.java b/javatests/google/registry/tools/GetApplicationIdsCommandTest.java index 89e60cb4b..ee479abd4 100644 --- a/javatests/google/registry/tools/GetApplicationIdsCommandTest.java +++ b/javatests/google/registry/tools/GetApplicationIdsCommandTest.java @@ -21,9 +21,7 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.DateTimeZone.UTC; import com.beust.jcommander.ParameterException; - import google.registry.model.domain.launch.LaunchPhase; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/GetClaimsListCommandTest.java b/javatests/google/registry/tools/GetClaimsListCommandTest.java index 82f144489..2d929a352 100644 --- a/javatests/google/registry/tools/GetClaimsListCommandTest.java +++ b/javatests/google/registry/tools/GetClaimsListCommandTest.java @@ -20,14 +20,11 @@ import static java.nio.file.Files.readAllLines; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableMap; - import google.registry.model.tmch.ClaimsListShard; - -import org.joda.time.DateTime; -import org.junit.Test; - import java.io.File; import java.nio.file.Files; +import org.joda.time.DateTime; +import org.junit.Test; /** Unit tests for {@link GetClaimsListCommand}. */ public class GetClaimsListCommandTest extends CommandTestCase { diff --git a/javatests/google/registry/tools/GetContactCommandTest.java b/javatests/google/registry/tools/GetContactCommandTest.java index 1192ebfc5..7167f8953 100644 --- a/javatests/google/registry/tools/GetContactCommandTest.java +++ b/javatests/google/registry/tools/GetContactCommandTest.java @@ -22,7 +22,6 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.DateTimeZone.UTC; import com.beust.jcommander.ParameterException; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/GetDomainCommandTest.java b/javatests/google/registry/tools/GetDomainCommandTest.java index 8f25302e6..b1d736928 100644 --- a/javatests/google/registry/tools/GetDomainCommandTest.java +++ b/javatests/google/registry/tools/GetDomainCommandTest.java @@ -22,7 +22,6 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.DateTimeZone.UTC; import com.beust.jcommander.ParameterException; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/GetHostCommandTest.java b/javatests/google/registry/tools/GetHostCommandTest.java index 0dcb76900..faf8fc6da 100644 --- a/javatests/google/registry/tools/GetHostCommandTest.java +++ b/javatests/google/registry/tools/GetHostCommandTest.java @@ -22,7 +22,6 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.DateTimeZone.UTC; import com.beust.jcommander.ParameterException; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/GetRegistrarCommandTest.java b/javatests/google/registry/tools/GetRegistrarCommandTest.java index 7a30fa2fc..88d5f6e52 100644 --- a/javatests/google/registry/tools/GetRegistrarCommandTest.java +++ b/javatests/google/registry/tools/GetRegistrarCommandTest.java @@ -15,7 +15,6 @@ package google.registry.tools; import com.beust.jcommander.ParameterException; - import org.junit.Test; /** Unit tests for {@link GetRegistrarCommand}. */ diff --git a/javatests/google/registry/tools/GetResourceByKeyCommandTest.java b/javatests/google/registry/tools/GetResourceByKeyCommandTest.java index f4ced223e..2bb65bf10 100644 --- a/javatests/google/registry/tools/GetResourceByKeyCommandTest.java +++ b/javatests/google/registry/tools/GetResourceByKeyCommandTest.java @@ -24,7 +24,6 @@ import static google.registry.testing.DatastoreHelper.persistDeletedHost; import static org.joda.time.DateTimeZone.UTC; import com.beust.jcommander.ParameterException; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/GetSchemaTreeCommandTest.java b/javatests/google/registry/tools/GetSchemaTreeCommandTest.java index 029b3c842..0385f00f9 100644 --- a/javatests/google/registry/tools/GetSchemaTreeCommandTest.java +++ b/javatests/google/registry/tools/GetSchemaTreeCommandTest.java @@ -18,9 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import com.google.re2j.Matcher; import com.google.re2j.Pattern; - import google.registry.model.EntityClasses; - import org.junit.Test; /** Unit tests for {@link GetSchemaTreeCommand}. */ diff --git a/javatests/google/registry/tools/GetTldCommandTest.java b/javatests/google/registry/tools/GetTldCommandTest.java index 807d88c8f..9671830fb 100644 --- a/javatests/google/registry/tools/GetTldCommandTest.java +++ b/javatests/google/registry/tools/GetTldCommandTest.java @@ -18,7 +18,6 @@ import static google.registry.testing.DatastoreHelper.createTld; import static google.registry.testing.DatastoreHelper.createTlds; import com.beust.jcommander.ParameterException; - import org.junit.Test; /** Unit tests for {@link GetTldCommand}. */ diff --git a/javatests/google/registry/tools/GhostrydeCommandTest.java b/javatests/google/registry/tools/GhostrydeCommandTest.java index a45c852e3..48378b839 100644 --- a/javatests/google/registry/tools/GhostrydeCommandTest.java +++ b/javatests/google/registry/tools/GhostrydeCommandTest.java @@ -23,16 +23,14 @@ import google.registry.rde.Ghostryde.DecodeResult; import google.registry.rde.RdeKeyringModule; import google.registry.testing.BouncyCastleProviderRule; import google.registry.testing.InjectRule; - -import org.joda.time.DateTime; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; - import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.attribute.FileTime; +import org.joda.time.DateTime; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; /** Unit tests for {@link GhostrydeCommand}. */ public class GhostrydeCommandTest extends CommandTestCase { diff --git a/javatests/google/registry/tools/GtechToolTest.java b/javatests/google/registry/tools/GtechToolTest.java index 18de839fb..607076ce4 100644 --- a/javatests/google/registry/tools/GtechToolTest.java +++ b/javatests/google/registry/tools/GtechToolTest.java @@ -25,9 +25,11 @@ import com.google.common.collect.Sets; import com.google.common.reflect.ClassPath; import com.google.common.reflect.ClassPath.ClassInfo; import com.google.common.truth.Expect; - import google.registry.tools.Command.GtechCommand; - +import java.io.IOException; +import java.lang.reflect.Modifier; +import java.util.Map; +import java.util.Set; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -35,11 +37,6 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.IOException; -import java.lang.reflect.Modifier; -import java.util.Map; -import java.util.Set; - /** Unit tests for {@link GtechTool}. */ @RunWith(JUnit4.class) public class GtechToolTest { diff --git a/javatests/google/registry/tools/ListCursorsCommandTest.java b/javatests/google/registry/tools/ListCursorsCommandTest.java index 79fbe7a10..130cf81b0 100644 --- a/javatests/google/registry/tools/ListCursorsCommandTest.java +++ b/javatests/google/registry/tools/ListCursorsCommandTest.java @@ -19,11 +19,9 @@ import static google.registry.testing.DatastoreHelper.createTlds; import static google.registry.testing.DatastoreHelper.persistResource; import com.beust.jcommander.ParameterException; - import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; import google.registry.model.registry.Registry; - import org.joda.time.DateTime; import org.junit.Test; diff --git a/javatests/google/registry/tools/ListDomainsCommandTest.java b/javatests/google/registry/tools/ListDomainsCommandTest.java index 5436bb8e6..5d5e0419c 100644 --- a/javatests/google/registry/tools/ListDomainsCommandTest.java +++ b/javatests/google/registry/tools/ListDomainsCommandTest.java @@ -15,7 +15,6 @@ package google.registry.tools; import google.registry.tools.server.ListDomainsAction; - import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; diff --git a/javatests/google/registry/tools/ListObjectsCommandTestCase.java b/javatests/google/registry/tools/ListObjectsCommandTestCase.java index 01d50b762..bd8f851f3 100644 --- a/javatests/google/registry/tools/ListObjectsCommandTestCase.java +++ b/javatests/google/registry/tools/ListObjectsCommandTestCase.java @@ -28,9 +28,7 @@ import static org.mockito.Mockito.when; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; - import google.registry.tools.ServerSideCommand.Connection; - import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/javatests/google/registry/tools/MutatingCommandTest.java b/javatests/google/registry/tools/MutatingCommandTest.java index 47c79f709..e459b5360 100644 --- a/javatests/google/registry/tools/MutatingCommandTest.java +++ b/javatests/google/registry/tools/MutatingCommandTest.java @@ -27,7 +27,7 @@ import google.registry.model.host.HostResource; import google.registry.model.registrar.Registrar; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; - +import java.util.Arrays; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; @@ -35,8 +35,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; -import java.util.Arrays; - /** Unit tests for {@link MutatingCommand}. */ @RunWith(MockitoJUnitRunner.class) public class MutatingCommandTest { diff --git a/javatests/google/registry/tools/PublishDetailReportCommandTest.java b/javatests/google/registry/tools/PublishDetailReportCommandTest.java index 6f714402b..8b8c4e92a 100644 --- a/javatests/google/registry/tools/PublishDetailReportCommandTest.java +++ b/javatests/google/registry/tools/PublishDetailReportCommandTest.java @@ -21,9 +21,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; - import google.registry.tools.ServerSideCommand.Connection; - import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/javatests/google/registry/tools/RegistrarContactCommandTest.java b/javatests/google/registry/tools/RegistrarContactCommandTest.java index 6b4f19488..07abdc214 100644 --- a/javatests/google/registry/tools/RegistrarContactCommandTest.java +++ b/javatests/google/registry/tools/RegistrarContactCommandTest.java @@ -24,15 +24,12 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; - -import org.junit.Before; -import org.junit.Test; - import java.nio.file.Files; import java.nio.file.Paths; +import org.junit.Before; +import org.junit.Test; /** Unit tests for {@link RegistrarContactCommand}. */ public class RegistrarContactCommandTest extends CommandTestCase { diff --git a/javatests/google/registry/tools/RegistryToolTest.java b/javatests/google/registry/tools/RegistryToolTest.java index 014a810ca..3ce40f887 100644 --- a/javatests/google/registry/tools/RegistryToolTest.java +++ b/javatests/google/registry/tools/RegistryToolTest.java @@ -25,7 +25,10 @@ import com.google.common.collect.Sets; import com.google.common.reflect.ClassPath; import com.google.common.reflect.ClassPath.ClassInfo; import com.google.common.truth.Expect; - +import java.io.IOException; +import java.lang.reflect.Modifier; +import java.util.Map; +import java.util.Set; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -33,11 +36,6 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.IOException; -import java.lang.reflect.Modifier; -import java.util.Map; -import java.util.Set; - /** Unit tests for {@link RegistryTool}. */ @RunWith(JUnit4.class) public class RegistryToolTest { diff --git a/javatests/google/registry/tools/ResaveEnvironmentEntitiesCommandTest.java b/javatests/google/registry/tools/ResaveEnvironmentEntitiesCommandTest.java index 4f41045ba..eec53d9df 100644 --- a/javatests/google/registry/tools/ResaveEnvironmentEntitiesCommandTest.java +++ b/javatests/google/registry/tools/ResaveEnvironmentEntitiesCommandTest.java @@ -21,14 +21,12 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.testing.DatastoreHelper.createTld; import com.google.common.base.Function; - import google.registry.model.ImmutableObject; import google.registry.model.ofy.CommitLogManifest; import google.registry.model.ofy.CommitLogMutation; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; import google.registry.model.registry.Registry; - import org.junit.Test; /** Unit tests for {@link ResaveEnvironmentEntitiesCommand}. */ diff --git a/javatests/google/registry/tools/SetupOteCommandTest.java b/javatests/google/registry/tools/SetupOteCommandTest.java index ea76ab577..1ae7d5041 100644 --- a/javatests/google/registry/tools/SetupOteCommandTest.java +++ b/javatests/google/registry/tools/SetupOteCommandTest.java @@ -23,23 +23,19 @@ import static google.registry.testing.DatastoreHelper.persistPremiumList; import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.DateTimeZone.UTC; +import com.beust.jcommander.ParameterException; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - -import com.beust.jcommander.ParameterException; - import google.registry.model.registrar.Registrar; import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.TldState; import google.registry.util.CidrAddressBlock; - +import java.security.cert.CertificateParsingException; import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Before; import org.junit.Test; -import java.security.cert.CertificateParsingException; - /** Unit tests for {@link SetupOteCommand}. */ public class SetupOteCommandTest extends CommandTestCase { diff --git a/javatests/google/registry/tools/UniformRapidSuspensionCommandTest.java b/javatests/google/registry/tools/UniformRapidSuspensionCommandTest.java index 0c7e061d3..bcb25f99f 100644 --- a/javatests/google/registry/tools/UniformRapidSuspensionCommandTest.java +++ b/javatests/google/registry/tools/UniformRapidSuspensionCommandTest.java @@ -19,21 +19,17 @@ import static google.registry.testing.DatastoreHelper.persistActiveDomain; import static google.registry.testing.DatastoreHelper.persistActiveHost; import static google.registry.testing.DatastoreHelper.persistResource; -import com.google.common.collect.ImmutableSet; - import com.beust.jcommander.ParameterException; +import com.google.common.collect.ImmutableSet; import com.googlecode.objectify.Ref; - import google.registry.model.domain.secdns.DelegationSignerData; import google.registry.model.eppcommon.StatusValue; import google.registry.model.host.HostResource; import google.registry.model.registrar.Registrar; - +import javax.xml.bind.annotation.adapters.HexBinaryAdapter; import org.junit.Before; import org.junit.Test; -import javax.xml.bind.annotation.adapters.HexBinaryAdapter; - /** Unit tests for {@link UniformRapidSuspensionCommand}. */ public class UniformRapidSuspensionCommandTest extends EppToolCommandTestCase { diff --git a/javatests/google/registry/tools/UpdateApplicationStatusCommandTest.java b/javatests/google/registry/tools/UpdateApplicationStatusCommandTest.java index 93a03a684..cdeab8d8c 100644 --- a/javatests/google/registry/tools/UpdateApplicationStatusCommandTest.java +++ b/javatests/google/registry/tools/UpdateApplicationStatusCommandTest.java @@ -30,7 +30,6 @@ import static google.registry.testing.HistoryEntrySubject.assertAboutHistoryEntr import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.FluentIterable; - import google.registry.model.domain.DomainApplication; import google.registry.model.eppcommon.StatusValue; import google.registry.model.eppcommon.Trid; @@ -38,7 +37,6 @@ import google.registry.model.poll.PendingActionNotificationResponse.DomainPendin import google.registry.model.poll.PollMessage; import google.registry.model.registrar.Registrar; import google.registry.model.reporting.HistoryEntry; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/UpdateClaimsNoticeCommandTest.java b/javatests/google/registry/tools/UpdateClaimsNoticeCommandTest.java index b3d261e2b..844dbcc18 100644 --- a/javatests/google/registry/tools/UpdateClaimsNoticeCommandTest.java +++ b/javatests/google/registry/tools/UpdateClaimsNoticeCommandTest.java @@ -24,13 +24,11 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableList; - import google.registry.model.domain.DomainApplication; import google.registry.model.domain.launch.LaunchNotice; import google.registry.model.domain.launch.LaunchNotice.InvalidChecksumException; import google.registry.model.reporting.HistoryEntry; import google.registry.model.smd.EncodedSignedMark; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/UpdateCursorsCommandTest.java b/javatests/google/registry/tools/UpdateCursorsCommandTest.java index 9fa6e8210..985b4b9f8 100644 --- a/javatests/google/registry/tools/UpdateCursorsCommandTest.java +++ b/javatests/google/registry/tools/UpdateCursorsCommandTest.java @@ -22,7 +22,6 @@ import static google.registry.testing.DatastoreHelper.persistResource; import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; import google.registry.model.registry.Registry; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/UpdatePremiumListCommandTest.java b/javatests/google/registry/tools/UpdatePremiumListCommandTest.java index b0dc06e57..1eb2abae8 100644 --- a/javatests/google/registry/tools/UpdatePremiumListCommandTest.java +++ b/javatests/google/registry/tools/UpdatePremiumListCommandTest.java @@ -23,10 +23,8 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; - import google.registry.tools.ServerSideCommand.Connection; import google.registry.tools.server.UpdatePremiumListAction; - import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/javatests/google/registry/tools/UpdateRegistrarCommandTest.java b/javatests/google/registry/tools/UpdateRegistrarCommandTest.java index d674320d0..fdd64994b 100644 --- a/javatests/google/registry/tools/UpdateRegistrarCommandTest.java +++ b/javatests/google/registry/tools/UpdateRegistrarCommandTest.java @@ -24,18 +24,15 @@ import static google.registry.testing.DatastoreHelper.createTlds; import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.DateTimeZone.UTC; +import com.beust.jcommander.ParameterException; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - -import com.beust.jcommander.ParameterException; - import google.registry.model.billing.RegistrarBillingEntry; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.Registrar.BillingMethod; import google.registry.model.registrar.Registrar.State; import google.registry.model.registrar.Registrar.Type; import google.registry.util.CidrAddressBlock; - import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Test; diff --git a/javatests/google/registry/tools/UpdateReservedListCommandTest.java b/javatests/google/registry/tools/UpdateReservedListCommandTest.java index ac1de7aee..13c1ff9ba 100644 --- a/javatests/google/registry/tools/UpdateReservedListCommandTest.java +++ b/javatests/google/registry/tools/UpdateReservedListCommandTest.java @@ -20,9 +20,7 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.collect.ImmutableList; - import google.registry.model.registry.label.ReservedList; - import org.junit.Test; /** Unit tests for {@link UpdateReservedListCommand}. */ diff --git a/javatests/google/registry/tools/UpdateServerLocksCommandTest.java b/javatests/google/registry/tools/UpdateServerLocksCommandTest.java index 136274c09..d6113d45c 100644 --- a/javatests/google/registry/tools/UpdateServerLocksCommandTest.java +++ b/javatests/google/registry/tools/UpdateServerLocksCommandTest.java @@ -15,7 +15,6 @@ package google.registry.tools; import com.beust.jcommander.ParameterException; - import org.junit.Test; /** Unit tests for {@link UpdateServerLocksCommand}. */ diff --git a/javatests/google/registry/tools/UpdateSmdCommandTest.java b/javatests/google/registry/tools/UpdateSmdCommandTest.java index caf5f67ba..d7ed250f6 100644 --- a/javatests/google/registry/tools/UpdateSmdCommandTest.java +++ b/javatests/google/registry/tools/UpdateSmdCommandTest.java @@ -26,7 +26,6 @@ import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import google.registry.flows.EppException.ParameterValuePolicyErrorException; import google.registry.flows.EppException.ParameterValueSyntaxErrorException; import google.registry.flows.EppException.RequiredParameterMissingException; @@ -35,7 +34,6 @@ import google.registry.model.reporting.HistoryEntry; import google.registry.model.smd.EncodedSignedMark; import google.registry.model.smd.SignedMarkRevocationList; import google.registry.tmch.TmchData; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/UpdateTldCommandTest.java b/javatests/google/registry/tools/UpdateTldCommandTest.java index 42518d476..60893b423 100644 --- a/javatests/google/registry/tools/UpdateTldCommandTest.java +++ b/javatests/google/registry/tools/UpdateTldCommandTest.java @@ -28,24 +28,20 @@ import static org.joda.money.CurrencyUnit.USD; import static org.joda.time.DateTimeZone.UTC; import static org.joda.time.Duration.standardMinutes; +import com.beust.jcommander.ParameterException; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; - -import com.beust.jcommander.ParameterException; import com.googlecode.objectify.Key; - import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.TldState; import google.registry.model.registry.label.PremiumList; - +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; - /** Unit tests for {@link UpdateTldCommand}. */ public class UpdateTldCommandTest extends CommandTestCase { diff --git a/javatests/google/registry/tools/UploadClaimsListCommandTest.java b/javatests/google/registry/tools/UploadClaimsListCommandTest.java index 3e24f6b8c..c5ce3db4c 100644 --- a/javatests/google/registry/tools/UploadClaimsListCommandTest.java +++ b/javatests/google/registry/tools/UploadClaimsListCommandTest.java @@ -17,12 +17,10 @@ package google.registry.tools; import static com.google.common.truth.Truth.assertThat; import google.registry.model.tmch.ClaimsListShard; - +import java.io.FileNotFoundException; import org.joda.time.DateTime; import org.junit.Test; -import java.io.FileNotFoundException; - /** Unit tests for {@link UploadClaimsListCommand}. */ public class UploadClaimsListCommandTest extends CommandTestCase { diff --git a/javatests/google/registry/tools/ValidateEscrowDepositCommandTest.java b/javatests/google/registry/tools/ValidateEscrowDepositCommandTest.java index 489b7cb8b..0f89d7df6 100644 --- a/javatests/google/registry/tools/ValidateEscrowDepositCommandTest.java +++ b/javatests/google/registry/tools/ValidateEscrowDepositCommandTest.java @@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat; import google.registry.rde.RdeTestData; import google.registry.xml.XmlException; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/javatests/google/registry/tools/ValidateLoginCredentialsCommandTest.java b/javatests/google/registry/tools/ValidateLoginCredentialsCommandTest.java index 83c9329a0..e0fb74eb6 100644 --- a/javatests/google/registry/tools/ValidateLoginCredentialsCommandTest.java +++ b/javatests/google/registry/tools/ValidateLoginCredentialsCommandTest.java @@ -18,17 +18,14 @@ import static google.registry.model.registrar.Registrar.State.ACTIVE; import static google.registry.testing.DatastoreHelper.createTld; import static google.registry.testing.DatastoreHelper.persistResource; +import com.beust.jcommander.ParameterException; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - -import com.beust.jcommander.ParameterException; - import google.registry.flows.EppException; import google.registry.flows.TransportCredentials.BadRegistrarPasswordException; import google.registry.model.registrar.Registrar; import google.registry.testing.CertificateSamples; import google.registry.util.CidrAddressBlock; - import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/params/DateTimeParameterTest.java b/javatests/google/registry/tools/params/DateTimeParameterTest.java index 5699e2fc6..9096feecb 100644 --- a/javatests/google/registry/tools/params/DateTimeParameterTest.java +++ b/javatests/google/registry/tools/params/DateTimeParameterTest.java @@ -18,9 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.joda.time.DateTimeZone.UTC; import com.beust.jcommander.ParameterException; - import google.registry.testing.ExceptionRule; - import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/tools/params/DurationParameterTest.java b/javatests/google/registry/tools/params/DurationParameterTest.java index 9b109723a..9409bceb2 100644 --- a/javatests/google/registry/tools/params/DurationParameterTest.java +++ b/javatests/google/registry/tools/params/DurationParameterTest.java @@ -17,9 +17,7 @@ package google.registry.tools.params; import static com.google.common.truth.Truth.assertThat; import com.beust.jcommander.ParameterException; - import google.registry.testing.ExceptionRule; - import org.joda.time.Duration; import org.joda.time.Period; import org.junit.Rule; diff --git a/javatests/google/registry/tools/params/MoneyParameterTest.java b/javatests/google/registry/tools/params/MoneyParameterTest.java index 9be3b37d9..e48d1c61d 100644 --- a/javatests/google/registry/tools/params/MoneyParameterTest.java +++ b/javatests/google/registry/tools/params/MoneyParameterTest.java @@ -17,9 +17,7 @@ package google.registry.tools.params; import static com.google.common.truth.Truth.assertThat; import com.beust.jcommander.ParameterException; - import google.registry.testing.ExceptionRule; - import org.joda.money.Money; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/tools/params/PathParameterTest.java b/javatests/google/registry/tools/params/PathParameterTest.java index f865e5928..5f9d115e5 100644 --- a/javatests/google/registry/tools/params/PathParameterTest.java +++ b/javatests/google/registry/tools/params/PathParameterTest.java @@ -23,21 +23,18 @@ import static org.junit.Assume.assumeThat; import static org.junit.Assume.assumeTrue; import com.beust.jcommander.ParameterException; - import google.registry.testing.ExceptionRule; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - import java.io.File; import java.nio.file.FileSystemNotFoundException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.attribute.PosixFilePermissions; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** Unit tests for {@link PathParameter}. */ @RunWith(JUnit4.class) diff --git a/javatests/google/registry/tools/params/PhoneNumberParameterTest.java b/javatests/google/registry/tools/params/PhoneNumberParameterTest.java index 66ad12282..f59e14f19 100644 --- a/javatests/google/registry/tools/params/PhoneNumberParameterTest.java +++ b/javatests/google/registry/tools/params/PhoneNumberParameterTest.java @@ -17,7 +17,6 @@ package google.registry.tools.params; import static com.google.common.truth.Truth.assertThat; import google.registry.testing.ExceptionRule; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/tools/params/YearMonthParameterTest.java b/javatests/google/registry/tools/params/YearMonthParameterTest.java index 85628d16e..afdc700e1 100644 --- a/javatests/google/registry/tools/params/YearMonthParameterTest.java +++ b/javatests/google/registry/tools/params/YearMonthParameterTest.java @@ -17,9 +17,7 @@ package google.registry.tools.params; import static com.google.common.truth.Truth.assertThat; import com.beust.jcommander.ParameterException; - import google.registry.testing.ExceptionRule; - import org.joda.time.YearMonth; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/tools/server/CreateGroupsActionTest.java b/javatests/google/registry/tools/server/CreateGroupsActionTest.java index b558a8828..8da21c953 100644 --- a/javatests/google/registry/tools/server/CreateGroupsActionTest.java +++ b/javatests/google/registry/tools/server/CreateGroupsActionTest.java @@ -21,7 +21,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.base.Optional; - import google.registry.groups.DirectoryGroupsConnection; import google.registry.groups.GroupsConnection.Role; import google.registry.request.HttpException.BadRequestException; @@ -30,7 +29,6 @@ import google.registry.request.Response; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.InjectRule; - import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/tools/server/CreatePremiumListActionTest.java b/javatests/google/registry/tools/server/CreatePremiumListActionTest.java index 59cff4911..8b5ee3466 100644 --- a/javatests/google/registry/tools/server/CreatePremiumListActionTest.java +++ b/javatests/google/registry/tools/server/CreatePremiumListActionTest.java @@ -22,7 +22,6 @@ import google.registry.model.registry.label.PremiumList; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeJsonResponse; - import org.joda.money.Money; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/tools/server/DeleteEntityActionTest.java b/javatests/google/registry/tools/server/DeleteEntityActionTest.java index e3e362425..f63657f17 100644 --- a/javatests/google/registry/tools/server/DeleteEntityActionTest.java +++ b/javatests/google/registry/tools/server/DeleteEntityActionTest.java @@ -21,13 +21,11 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.appengine.api.datastore.Entity; import com.google.appengine.api.datastore.KeyFactory; - import google.registry.model.registry.label.ReservedList; import google.registry.request.HttpException.BadRequestException; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeResponse; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/tools/server/DeleteProberDataActionTest.java b/javatests/google/registry/tools/server/DeleteProberDataActionTest.java index 4b45a88e0..888fe2102 100644 --- a/javatests/google/registry/tools/server/DeleteProberDataActionTest.java +++ b/javatests/google/registry/tools/server/DeleteProberDataActionTest.java @@ -25,9 +25,7 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Key; - import google.registry.mapreduce.MapreduceRunner; import google.registry.model.ImmutableObject; import google.registry.model.billing.BillingEvent; @@ -42,7 +40,7 @@ import google.registry.model.reporting.HistoryEntry; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeResponse; import google.registry.testing.mapreduce.MapreduceTestCase; - +import java.util.Set; import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; @@ -51,8 +49,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.Set; - /** Unit tests for {@link DeleteProberDataAction}. */ @RunWith(JUnit4.class) public class DeleteProberDataActionTest extends MapreduceTestCase { diff --git a/javatests/google/registry/tools/server/GenerateZoneFilesActionTest.java b/javatests/google/registry/tools/server/GenerateZoneFilesActionTest.java index e81058454..3d8f0765a 100644 --- a/javatests/google/registry/tools/server/GenerateZoneFilesActionTest.java +++ b/javatests/google/registry/tools/server/GenerateZoneFilesActionTest.java @@ -36,24 +36,20 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Ref; - import google.registry.mapreduce.MapreduceRunner; import google.registry.model.domain.secdns.DelegationSignerData; import google.registry.model.host.HostResource; import google.registry.testing.FakeClock; import google.registry.testing.mapreduce.MapreduceTestCase; - +import java.net.InetAddress; +import java.util.Map; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.net.InetAddress; -import java.util.Map; - /** Tests for {@link GenerateZoneFilesAction}.*/ @RunWith(JUnit4.class) public class GenerateZoneFilesActionTest extends MapreduceTestCase { diff --git a/javatests/google/registry/tools/server/KillAllCommitLogsActionTest.java b/javatests/google/registry/tools/server/KillAllCommitLogsActionTest.java index 3cc33b47d..471e79f8f 100644 --- a/javatests/google/registry/tools/server/KillAllCommitLogsActionTest.java +++ b/javatests/google/registry/tools/server/KillAllCommitLogsActionTest.java @@ -32,7 +32,6 @@ import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import google.registry.mapreduce.MapreduceRunner; import google.registry.model.ImmutableObject; import google.registry.model.ofy.CommitLogBucket; @@ -42,13 +41,11 @@ import google.registry.model.ofy.CommitLogManifest; import google.registry.model.ofy.CommitLogMutation; import google.registry.testing.FakeResponse; import google.registry.testing.mapreduce.MapreduceTestCase; - +import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.List; - /** Tests for {@link KillAllCommitLogsAction}.*/ @RunWith(JUnit4.class) public class KillAllCommitLogsActionTest extends MapreduceTestCase { diff --git a/javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java b/javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java index b21f5ac6d..770640eff 100644 --- a/javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java +++ b/javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java @@ -36,9 +36,7 @@ import com.google.common.base.Optional; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Iterables; - import com.googlecode.objectify.Key; - import google.registry.mapreduce.MapreduceRunner; import google.registry.model.EppResource; import google.registry.model.ImmutableObject; @@ -56,15 +54,13 @@ import google.registry.model.poll.PollMessage; import google.registry.model.reporting.HistoryEntry; import google.registry.testing.FakeResponse; import google.registry.testing.mapreduce.MapreduceTestCase; - +import java.util.Set; import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.Set; - /** Tests for {@link KillAllEppResourcesAction}.*/ @RunWith(JUnit4.class) public class KillAllEppResourcesActionTest extends MapreduceTestCase { diff --git a/javatests/google/registry/tools/server/ListActionTestCase.java b/javatests/google/registry/tools/server/ListActionTestCase.java index f226c5ee7..828ee4d06 100644 --- a/javatests/google/registry/tools/server/ListActionTestCase.java +++ b/javatests/google/registry/tools/server/ListActionTestCase.java @@ -18,15 +18,12 @@ import static com.google.common.truth.Truth.assertThat; import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.base.Optional; - import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeJsonResponse; - -import org.junit.Rule; - import java.util.List; import java.util.regex.Pattern; +import org.junit.Rule; /** * Base class for tests of list actions. diff --git a/javatests/google/registry/tools/server/ListDomainsActionTest.java b/javatests/google/registry/tools/server/ListDomainsActionTest.java index f1450a091..bd9840300 100644 --- a/javatests/google/registry/tools/server/ListDomainsActionTest.java +++ b/javatests/google/registry/tools/server/ListDomainsActionTest.java @@ -19,9 +19,7 @@ import static google.registry.testing.DatastoreHelper.createTlds; import static google.registry.testing.DatastoreHelper.persistActiveDomain; import com.google.common.base.Optional; - import google.registry.testing.FakeClock; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/server/ListHostsActionTest.java b/javatests/google/registry/tools/server/ListHostsActionTest.java index f539cf0e6..5fa49e833 100644 --- a/javatests/google/registry/tools/server/ListHostsActionTest.java +++ b/javatests/google/registry/tools/server/ListHostsActionTest.java @@ -18,9 +18,7 @@ import static google.registry.testing.DatastoreHelper.createTld; import static google.registry.testing.DatastoreHelper.persistActiveHost; import com.google.common.base.Optional; - import google.registry.testing.FakeClock; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/server/ListPremiumListsActionTest.java b/javatests/google/registry/tools/server/ListPremiumListsActionTest.java index fd9fd7526..f42b7042c 100644 --- a/javatests/google/registry/tools/server/ListPremiumListsActionTest.java +++ b/javatests/google/registry/tools/server/ListPremiumListsActionTest.java @@ -17,9 +17,7 @@ package google.registry.tools.server; import static google.registry.testing.DatastoreHelper.persistPremiumList; import com.google.common.base.Optional; - import google.registry.model.registry.label.PremiumList; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/tools/server/ListRegistrarsActionTest.java b/javatests/google/registry/tools/server/ListRegistrarsActionTest.java index 38df138d1..f08c49342 100644 --- a/javatests/google/registry/tools/server/ListRegistrarsActionTest.java +++ b/javatests/google/registry/tools/server/ListRegistrarsActionTest.java @@ -19,9 +19,7 @@ import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; - import google.registry.model.registrar.Registrar; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/tools/server/ListReservedListsActionTest.java b/javatests/google/registry/tools/server/ListReservedListsActionTest.java index a26f53cbc..c805b0126 100644 --- a/javatests/google/registry/tools/server/ListReservedListsActionTest.java +++ b/javatests/google/registry/tools/server/ListReservedListsActionTest.java @@ -19,10 +19,8 @@ import static google.registry.testing.DatastoreHelper.persistReservedList; import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.base.Optional; - import google.registry.model.registry.Registry; import google.registry.model.registry.label.ReservedList; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/tools/server/ListTldsActionTest.java b/javatests/google/registry/tools/server/ListTldsActionTest.java index 052f38e78..43401239a 100644 --- a/javatests/google/registry/tools/server/ListTldsActionTest.java +++ b/javatests/google/registry/tools/server/ListTldsActionTest.java @@ -17,9 +17,7 @@ package google.registry.tools.server; import static google.registry.testing.DatastoreHelper.createTld; import com.google.common.base.Optional; - import google.registry.testing.FakeClock; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/server/ResaveAllEppResourcesActionTest.java b/javatests/google/registry/tools/server/ResaveAllEppResourcesActionTest.java index 6bb40c279..1e039847a 100644 --- a/javatests/google/registry/tools/server/ResaveAllEppResourcesActionTest.java +++ b/javatests/google/registry/tools/server/ResaveAllEppResourcesActionTest.java @@ -19,12 +19,10 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.testing.DatastoreHelper.persistActiveContact; import com.google.common.base.Optional; - import google.registry.mapreduce.MapreduceRunner; import google.registry.model.contact.ContactResource; import google.registry.testing.FakeResponse; import google.registry.testing.mapreduce.MapreduceTestCase; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/server/UpdatePremiumListActionTest.java b/javatests/google/registry/tools/server/UpdatePremiumListActionTest.java index 3a15cbcb3..5b00d56f9 100644 --- a/javatests/google/registry/tools/server/UpdatePremiumListActionTest.java +++ b/javatests/google/registry/tools/server/UpdatePremiumListActionTest.java @@ -22,7 +22,6 @@ import google.registry.model.registry.label.PremiumList; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeJsonResponse; - import org.joda.money.Money; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/ui/forms/FormFieldExceptionTest.java b/javatests/google/registry/ui/forms/FormFieldExceptionTest.java index c111af06c..6232b4245 100644 --- a/javatests/google/registry/ui/forms/FormFieldExceptionTest.java +++ b/javatests/google/registry/ui/forms/FormFieldExceptionTest.java @@ -17,7 +17,6 @@ package google.registry.ui.forms; import static com.google.common.truth.Truth.assertThat; import com.google.common.testing.NullPointerTester; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/javatests/google/registry/ui/forms/FormFieldTest.java b/javatests/google/registry/ui/forms/FormFieldTest.java index a53be3215..b6035e3f2 100644 --- a/javatests/google/registry/ui/forms/FormFieldTest.java +++ b/javatests/google/registry/ui/forms/FormFieldTest.java @@ -31,17 +31,15 @@ import com.google.common.collect.Lists; import com.google.common.collect.Range; import com.google.common.testing.NullPointerTester; import com.google.re2j.Pattern; - +import java.util.List; +import java.util.Map; +import java.util.Set; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** Unit tests for {@link FormField}. */ @RunWith(JUnit4.class) public class FormFieldTest { diff --git a/javatests/google/registry/ui/forms/FormFieldsTest.java b/javatests/google/registry/ui/forms/FormFieldsTest.java index 7014412fd..b9f07079a 100644 --- a/javatests/google/registry/ui/forms/FormFieldsTest.java +++ b/javatests/google/registry/ui/forms/FormFieldsTest.java @@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.hamcrest.Matchers.equalTo; import com.google.common.testing.NullPointerTester; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/javatests/google/registry/ui/server/RegistrarFormFieldsTest.java b/javatests/google/registry/ui/server/RegistrarFormFieldsTest.java index 7a774ccc9..cdc431c8b 100644 --- a/javatests/google/registry/ui/server/RegistrarFormFieldsTest.java +++ b/javatests/google/registry/ui/server/RegistrarFormFieldsTest.java @@ -19,7 +19,6 @@ import static org.hamcrest.Matchers.equalTo; import google.registry.testing.CertificateSamples; import google.registry.ui.forms.FormFieldException; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/javatests/google/registry/ui/server/registrar/ConsoleUiActionTest.java b/javatests/google/registry/ui/server/registrar/ConsoleUiActionTest.java index 7afcceb0a..3895dbbb2 100644 --- a/javatests/google/registry/ui/server/registrar/ConsoleUiActionTest.java +++ b/javatests/google/registry/ui/server/registrar/ConsoleUiActionTest.java @@ -20,11 +20,10 @@ import static org.mockito.Mockito.when; import com.google.appengine.api.users.UserServiceFactory; import com.google.common.net.MediaType; - import google.registry.testing.AppEngineRule; import google.registry.testing.FakeResponse; import google.registry.testing.UserInfo; - +import javax.servlet.http.HttpServletRequest; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -32,8 +31,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import javax.servlet.http.HttpServletRequest; - /** Unit tests for {@link ConsoleUiAction}. */ @RunWith(MockitoJUnitRunner.class) public class ConsoleUiActionTest { diff --git a/javatests/google/registry/ui/server/registrar/ContactSettingsTest.java b/javatests/google/registry/ui/server/registrar/ContactSettingsTest.java index d6ad7653e..0e8cad441 100644 --- a/javatests/google/registry/ui/server/registrar/ContactSettingsTest.java +++ b/javatests/google/registry/ui/server/registrar/ContactSettingsTest.java @@ -23,18 +23,15 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; import google.registry.testing.AppEngineRule; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; - import java.util.HashMap; import java.util.List; import java.util.Map; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.runners.MockitoJUnitRunner; /** * Unit tests for contact_settings.js use of {@link RegistrarServlet}. diff --git a/javatests/google/registry/ui/server/registrar/RegistrarPaymentActionTest.java b/javatests/google/registry/ui/server/registrar/RegistrarPaymentActionTest.java index 91aeee716..5f72e763f 100644 --- a/javatests/google/registry/ui/server/registrar/RegistrarPaymentActionTest.java +++ b/javatests/google/registry/ui/server/registrar/RegistrarPaymentActionTest.java @@ -21,8 +21,6 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.google.common.collect.ImmutableMap; - import com.braintreegateway.BraintreeGateway; import com.braintreegateway.Result; import com.braintreegateway.Transaction; @@ -32,10 +30,10 @@ import com.braintreegateway.TransactionRequest; import com.braintreegateway.ValidationError; import com.braintreegateway.ValidationErrorCode; import com.braintreegateway.ValidationErrors; - +import com.google.common.collect.ImmutableMap; import google.registry.model.registrar.Registrar; import google.registry.testing.AppEngineRule; - +import java.math.BigDecimal; import org.joda.money.CurrencyUnit; import org.junit.Before; import org.junit.Rule; @@ -46,8 +44,6 @@ import org.mockito.Captor; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import java.math.BigDecimal; - /** Tests for {@link RegistrarPaymentAction}. */ @RunWith(MockitoJUnitRunner.class) public class RegistrarPaymentActionTest { diff --git a/javatests/google/registry/ui/server/registrar/RegistrarPaymentSetupActionTest.java b/javatests/google/registry/ui/server/registrar/RegistrarPaymentSetupActionTest.java index a818065bf..4dfc11216 100644 --- a/javatests/google/registry/ui/server/registrar/RegistrarPaymentSetupActionTest.java +++ b/javatests/google/registry/ui/server/registrar/RegistrarPaymentSetupActionTest.java @@ -20,15 +20,12 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.google.common.collect.ImmutableMap; - import com.braintreegateway.BraintreeGateway; import com.braintreegateway.ClientTokenGateway; - +import com.google.common.collect.ImmutableMap; import google.registry.braintree.BraintreeRegistrarSyncer; import google.registry.model.registrar.Registrar; import google.registry.testing.AppEngineRule; - import org.joda.money.CurrencyUnit; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/ui/server/registrar/RegistrarServletTest.java b/javatests/google/registry/ui/server/registrar/RegistrarServletTest.java index aea5f08e1..5eabdf54f 100644 --- a/javatests/google/registry/ui/server/registrar/RegistrarServletTest.java +++ b/javatests/google/registry/ui/server/registrar/RegistrarServletTest.java @@ -26,17 +26,14 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; - import google.registry.export.sheet.SyncRegistrarsSheetAction; import google.registry.model.registrar.Registrar; import google.registry.testing.TaskQueueHelper.TaskMatcher; - +import javax.mail.internet.InternetAddress; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; -import javax.mail.internet.InternetAddress; - /** Tests for {@link RegistrarServlet}. */ @RunWith(MockitoJUnitRunner.class) public class RegistrarServletTest extends RegistrarServletTestCase { diff --git a/javatests/google/registry/ui/server/registrar/RegistrarServletTestCase.java b/javatests/google/registry/ui/server/registrar/RegistrarServletTestCase.java index 560c27f00..ed1d19f9c 100644 --- a/javatests/google/registry/ui/server/registrar/RegistrarServletTestCase.java +++ b/javatests/google/registry/ui/server/registrar/RegistrarServletTestCase.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.when; import com.google.appengine.api.modules.ModulesService; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; - import google.registry.export.sheet.SyncRegistrarsSheetAction; import google.registry.model.ofy.Ofy; import google.registry.testing.AppEngineRule; @@ -32,7 +31,15 @@ import google.registry.testing.FakeClock; import google.registry.testing.InjectRule; import google.registry.util.SendEmailService; import google.registry.util.SendEmailUtils; - +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.Map; +import java.util.Properties; +import javax.mail.Message; +import javax.mail.Session; +import javax.mail.internet.MimeMessage; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; @@ -40,17 +47,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.Map; -import java.util.Properties; - -import javax.mail.Message; -import javax.mail.Session; -import javax.mail.internet.MimeMessage; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** Base class for tests using {@link RegistrarServlet}. */ @RunWith(MockitoJUnitRunner.class) public class RegistrarServletTestCase { diff --git a/javatests/google/registry/ui/server/registrar/SecuritySettingsTest.java b/javatests/google/registry/ui/server/registrar/SecuritySettingsTest.java index 9c2e37328..4a0a4fb78 100644 --- a/javatests/google/registry/ui/server/registrar/SecuritySettingsTest.java +++ b/javatests/google/registry/ui/server/registrar/SecuritySettingsTest.java @@ -26,16 +26,13 @@ import static java.util.Arrays.asList; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; - import google.registry.config.RegistryEnvironment; import google.registry.model.registrar.Registrar; - +import java.util.Map; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; -import java.util.Map; - /** * Unit tests for security_settings.js use of {@link RegistrarServlet}. * diff --git a/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java b/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java index be520debc..fe7f3ba74 100644 --- a/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java +++ b/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java @@ -25,13 +25,14 @@ import static org.mockito.Mockito.when; import com.google.appengine.api.users.User; import com.google.appengine.api.users.UserService; import com.google.common.testing.NullPointerTester; - import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.InjectRule; - +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -39,10 +40,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - /** Unit tests for {@link SessionUtils}. */ @RunWith(MockitoJUnitRunner.class) public class SessionUtilsTest { diff --git a/javatests/google/registry/ui/server/registrar/WhoisSettingsTest.java b/javatests/google/registry/ui/server/registrar/WhoisSettingsTest.java index 643545e7e..ff660249b 100644 --- a/javatests/google/registry/ui/server/registrar/WhoisSettingsTest.java +++ b/javatests/google/registry/ui/server/registrar/WhoisSettingsTest.java @@ -22,10 +22,8 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarAddress; - import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; diff --git a/javatests/google/registry/util/CidrAddressBlockTest.java b/javatests/google/registry/util/CidrAddressBlockTest.java index b51fe5cc2..d5a140ae8 100644 --- a/javatests/google/registry/util/CidrAddressBlockTest.java +++ b/javatests/google/registry/util/CidrAddressBlockTest.java @@ -18,13 +18,11 @@ import com.google.common.collect.ImmutableMap; import com.google.common.net.InetAddresses; import com.google.common.testing.NullPointerTester; import com.google.common.testing.SerializableTester; - -import junit.framework.TestCase; - import java.net.InetAddress; import java.util.Iterator; import java.util.Map; import java.util.NoSuchElementException; +import junit.framework.TestCase; /** * Tests for {@link CidrAddressBlock}. diff --git a/javatests/google/registry/util/CollectionUtilsTest.java b/javatests/google/registry/util/CollectionUtilsTest.java index 7dc5a1b5e..dc0d71bd0 100644 --- a/javatests/google/registry/util/CollectionUtilsTest.java +++ b/javatests/google/registry/util/CollectionUtilsTest.java @@ -21,16 +21,13 @@ import static google.registry.util.CollectionUtils.partitionMap; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import google.registry.testing.ExceptionRule; - +import java.util.Map; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; -import java.util.Map; - /** Unit tests for {@link CollectionUtils} */ @RunWith(MockitoJUnitRunner.class) public class CollectionUtilsTest { diff --git a/javatests/google/registry/util/ConcurrentTest.java b/javatests/google/registry/util/ConcurrentTest.java index cde36ef83..1a5bb97e1 100644 --- a/javatests/google/registry/util/ConcurrentTest.java +++ b/javatests/google/registry/util/ConcurrentTest.java @@ -22,9 +22,7 @@ import com.google.common.base.Functions; import com.google.common.collect.ImmutableList; import com.google.common.testing.NullPointerTester; import com.google.common.util.concurrent.UncheckedExecutionException; - import google.registry.testing.AppEngineRule; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/util/DateTimeUtilsTest.java b/javatests/google/registry/util/DateTimeUtilsTest.java index 25c6892df..d54164b74 100644 --- a/javatests/google/registry/util/DateTimeUtilsTest.java +++ b/javatests/google/registry/util/DateTimeUtilsTest.java @@ -24,9 +24,7 @@ import static google.registry.util.DateTimeUtils.latestOf; import static google.registry.util.DateTimeUtils.leapSafeAddYears; import com.google.common.collect.ImmutableList; - import google.registry.testing.ExceptionRule; - import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/util/DiffUtilsTest.java b/javatests/google/registry/util/DiffUtilsTest.java index d113205b8..71362836b 100644 --- a/javatests/google/registry/util/DiffUtilsTest.java +++ b/javatests/google/registry/util/DiffUtilsTest.java @@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.util.DiffUtils.prettyPrintSetDiff; import com.google.common.collect.ImmutableSet; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/javatests/google/registry/util/DomainNameUtilsTest.java b/javatests/google/registry/util/DomainNameUtilsTest.java index 61b4293c6..87acafa30 100644 --- a/javatests/google/registry/util/DomainNameUtilsTest.java +++ b/javatests/google/registry/util/DomainNameUtilsTest.java @@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.util.DomainNameUtils.canonicalizeDomainName; import google.registry.testing.ExceptionRule; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/util/HexDumperTest.java b/javatests/google/registry/util/HexDumperTest.java index 4b9566f5c..7702b3537 100644 --- a/javatests/google/registry/util/HexDumperTest.java +++ b/javatests/google/registry/util/HexDumperTest.java @@ -18,14 +18,12 @@ import static com.google.common.truth.Truth.assertThat; import static java.nio.charset.StandardCharsets.UTF_8; import google.registry.testing.ExceptionRule; - +import java.io.StringWriter; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.StringWriter; - /** Unit tests for {@link HexDumper}. */ @RunWith(JUnit4.class) public class HexDumperTest { diff --git a/javatests/google/registry/util/PosixTarHeaderSystemTest.java b/javatests/google/registry/util/PosixTarHeaderSystemTest.java index 6e581b104..8919e2935 100644 --- a/javatests/google/registry/util/PosixTarHeaderSystemTest.java +++ b/javatests/google/registry/util/PosixTarHeaderSystemTest.java @@ -24,14 +24,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.io.CharStreams; import com.google.common.io.Files; - -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -39,6 +31,12 @@ import java.io.InputStreamReader; import java.util.Map; import java.util.Random; import java.util.Set; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** System integration tests for {@link PosixTarHeader}. */ @RunWith(JUnit4.class) diff --git a/javatests/google/registry/util/PosixTarHeaderTest.java b/javatests/google/registry/util/PosixTarHeaderTest.java index 92b820b85..4e4b01246 100644 --- a/javatests/google/registry/util/PosixTarHeaderTest.java +++ b/javatests/google/registry/util/PosixTarHeaderTest.java @@ -20,9 +20,12 @@ import static com.google.common.truth.Truth.assertWithMessage; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.testing.EqualsTester; - import google.registry.testing.ExceptionRule; - +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.util.Arrays; +import java.util.zip.GZIPInputStream; import org.joda.time.DateTime; import org.joda.time.format.ISODateTimeFormat; import org.junit.Rule; @@ -30,12 +33,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.util.Arrays; -import java.util.zip.GZIPInputStream; - /** Unit tests for {@link PosixTarHeader}. */ @RunWith(JUnit4.class) public class PosixTarHeaderTest { diff --git a/javatests/google/registry/util/RetrierTest.java b/javatests/google/registry/util/RetrierTest.java index e0bf2b011..907e5b490 100644 --- a/javatests/google/registry/util/RetrierTest.java +++ b/javatests/google/registry/util/RetrierTest.java @@ -17,14 +17,12 @@ package google.registry.util; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; import google.registry.testing.FakeSleeper; - +import java.util.concurrent.Callable; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.concurrent.Callable; - /** Unit tests for {@link Retrier}. */ @RunWith(JUnit4.class) public class RetrierTest { diff --git a/javatests/google/registry/util/SendEmailUtilsTest.java b/javatests/google/registry/util/SendEmailUtilsTest.java index 643f2b1aa..d8b46959c 100644 --- a/javatests/google/registry/util/SendEmailUtilsTest.java +++ b/javatests/google/registry/util/SendEmailUtilsTest.java @@ -23,25 +23,21 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableList; - import google.registry.testing.ExceptionRule; import google.registry.testing.InjectRule; - -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; - import java.util.Properties; - import javax.mail.Message; import javax.mail.Message.RecipientType; import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.runners.MockitoJUnitRunner; /** Unit tests for {@link SendEmailUtils}. */ @RunWith(MockitoJUnitRunner.class) diff --git a/javatests/google/registry/util/SerializeUtilsTest.java b/javatests/google/registry/util/SerializeUtilsTest.java index 9c245fd56..1c7f40d68 100644 --- a/javatests/google/registry/util/SerializeUtilsTest.java +++ b/javatests/google/registry/util/SerializeUtilsTest.java @@ -19,7 +19,6 @@ import static google.registry.util.SerializeUtils.deserialize; import static google.registry.util.SerializeUtils.serialize; import google.registry.testing.ExceptionRule; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/util/SqlTemplateTest.java b/javatests/google/registry/util/SqlTemplateTest.java index da9bb6595..aaeed40dd 100644 --- a/javatests/google/registry/util/SqlTemplateTest.java +++ b/javatests/google/registry/util/SqlTemplateTest.java @@ -17,7 +17,6 @@ package google.registry.util; import static com.google.common.truth.Truth.assertThat; import google.registry.testing.ExceptionRule; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/util/TaskEnqueuerTest.java b/javatests/google/registry/util/TaskEnqueuerTest.java index d9117d836..b56e22c09 100644 --- a/javatests/google/registry/util/TaskEnqueuerTest.java +++ b/javatests/google/registry/util/TaskEnqueuerTest.java @@ -26,12 +26,10 @@ import com.google.appengine.api.taskqueue.TaskHandle; import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TransientFailureException; import com.google.common.collect.ImmutableList; - import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; import google.registry.testing.FakeSleeper; - import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/util/TeeOutputStreamTest.java b/javatests/google/registry/util/TeeOutputStreamTest.java index 0759e4700..eab30bd65 100644 --- a/javatests/google/registry/util/TeeOutputStreamTest.java +++ b/javatests/google/registry/util/TeeOutputStreamTest.java @@ -18,17 +18,14 @@ import static com.google.common.truth.Truth.assertThat; import static java.util.Arrays.asList; import com.google.common.collect.ImmutableSet; - import google.registry.testing.ExceptionRule; - +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.ByteArrayOutputStream; -import java.io.OutputStream; - /** Unit tests for {@link TeeOutputStream}. */ @RunWith(JUnit4.class) public class TeeOutputStreamTest { diff --git a/javatests/google/registry/util/UrlFetchUtilsTest.java b/javatests/google/registry/util/UrlFetchUtilsTest.java index 2c48cdf96..6cc40c114 100644 --- a/javatests/google/registry/util/UrlFetchUtilsTest.java +++ b/javatests/google/registry/util/UrlFetchUtilsTest.java @@ -28,10 +28,10 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import com.google.appengine.api.urlfetch.HTTPHeader; import com.google.appengine.api.urlfetch.HTTPRequest; - import google.registry.testing.AppEngineRule; import google.registry.testing.InjectRule; - +import java.security.SecureRandom; +import java.util.Arrays; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -41,9 +41,6 @@ import org.mockito.ArgumentMatcher; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import java.security.SecureRandom; -import java.util.Arrays; - /** Unit tests for {@link UrlFetchUtils}. */ @RunWith(JUnit4.class) public class UrlFetchUtilsTest { diff --git a/javatests/google/registry/whois/DomainWhoisResponseTest.java b/javatests/google/registry/whois/DomainWhoisResponseTest.java index 32e5acd22..440d5731f 100644 --- a/javatests/google/registry/whois/DomainWhoisResponseTest.java +++ b/javatests/google/registry/whois/DomainWhoisResponseTest.java @@ -22,9 +22,7 @@ import static google.registry.whois.WhoisHelper.loadWhoisTestFile; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import com.googlecode.objectify.Ref; - import google.registry.model.contact.ContactAddress; import google.registry.model.contact.ContactPhoneNumber; import google.registry.model.contact.ContactResource; @@ -39,7 +37,6 @@ import google.registry.model.host.HostResource; import google.registry.model.registrar.Registrar; import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/whois/NameserverWhoisResponseTest.java b/javatests/google/registry/whois/NameserverWhoisResponseTest.java index b79f7ebc8..6e114e4a7 100644 --- a/javatests/google/registry/whois/NameserverWhoisResponseTest.java +++ b/javatests/google/registry/whois/NameserverWhoisResponseTest.java @@ -22,12 +22,10 @@ import static google.registry.whois.WhoisHelper.loadWhoisTestFile; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; - import google.registry.model.host.HostResource; import google.registry.model.registrar.Registrar; import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; - import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/whois/RegistrarWhoisResponseTest.java b/javatests/google/registry/whois/RegistrarWhoisResponseTest.java index e991b6320..756342ead 100644 --- a/javatests/google/registry/whois/RegistrarWhoisResponseTest.java +++ b/javatests/google/registry/whois/RegistrarWhoisResponseTest.java @@ -21,13 +21,11 @@ import static google.registry.whois.WhoisHelper.loadWhoisTestFile; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarAddress; import google.registry.model.registrar.RegistrarContact; import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; - import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/whois/WhoisHttpServerTest.java b/javatests/google/registry/whois/WhoisHttpServerTest.java index 93f7082a0..a0e8f967d 100644 --- a/javatests/google/registry/whois/WhoisHttpServerTest.java +++ b/javatests/google/registry/whois/WhoisHttpServerTest.java @@ -34,7 +34,6 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; import google.registry.testing.InjectRule; - import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.After; diff --git a/javatests/google/registry/whois/WhoisInjectionTest.java b/javatests/google/registry/whois/WhoisInjectionTest.java index 13ae2a502..25c22b9f8 100644 --- a/javatests/google/registry/whois/WhoisInjectionTest.java +++ b/javatests/google/registry/whois/WhoisInjectionTest.java @@ -24,21 +24,18 @@ import static org.mockito.Mockito.when; import google.registry.request.RequestModule; import google.registry.testing.AppEngineRule; - +import java.io.BufferedReader; +import java.io.PrintWriter; +import java.io.StringReader; +import java.io.StringWriter; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.BufferedReader; -import java.io.PrintWriter; -import java.io.StringReader; -import java.io.StringWriter; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** Unit tests for Dagger injection of the whois package. */ @RunWith(JUnit4.class) public final class WhoisInjectionTest { diff --git a/javatests/google/registry/whois/WhoisReaderTest.java b/javatests/google/registry/whois/WhoisReaderTest.java index 404627c2a..3712c5ea5 100644 --- a/javatests/google/registry/whois/WhoisReaderTest.java +++ b/javatests/google/registry/whois/WhoisReaderTest.java @@ -20,15 +20,13 @@ import static google.registry.testing.DatastoreHelper.createTlds; import google.registry.testing.AppEngineRule; import google.registry.testing.ExceptionRule; import google.registry.testing.FakeClock; - +import java.io.StringReader; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.StringReader; - /** Unit tests for {@link WhoisReader}. */ @RunWith(JUnit4.class) public class WhoisReaderTest { diff --git a/javatests/google/registry/whois/WhoisServerTest.java b/javatests/google/registry/whois/WhoisServerTest.java index 0b2b4497b..5d101f66b 100644 --- a/javatests/google/registry/whois/WhoisServerTest.java +++ b/javatests/google/registry/whois/WhoisServerTest.java @@ -37,7 +37,7 @@ import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; import google.registry.testing.InjectRule; - +import java.io.StringReader; import org.joda.time.DateTime; import org.junit.Before; import org.junit.Ignore; @@ -46,8 +46,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.StringReader; - /** Unit tests for {@link WhoisServer}. */ @RunWith(JUnit4.class) public class WhoisServerTest { diff --git a/javatests/google/registry/whois/WhoisTestComponent.java b/javatests/google/registry/whois/WhoisTestComponent.java index 60704a1c6..5d9d91dda 100644 --- a/javatests/google/registry/whois/WhoisTestComponent.java +++ b/javatests/google/registry/whois/WhoisTestComponent.java @@ -15,11 +15,9 @@ package google.registry.whois; import dagger.Component; - import google.registry.config.ConfigModule; import google.registry.request.RequestModule; import google.registry.util.SystemClock.SystemClockModule; - import javax.inject.Singleton; @Singleton diff --git a/javatests/google/registry/xjc/XjcObjectTest.java b/javatests/google/registry/xjc/XjcObjectTest.java index 0419fcc55..8fd792d97 100644 --- a/javatests/google/registry/xjc/XjcObjectTest.java +++ b/javatests/google/registry/xjc/XjcObjectTest.java @@ -22,20 +22,17 @@ import static java.nio.charset.StandardCharsets.UTF_16; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.re2j.Pattern; - import google.registry.testing.ExceptionRule; import google.registry.xjc.rde.XjcRdeDeposit; import google.registry.xjc.rde.XjcRdeDepositTypeType; import google.registry.xjc.rdecontact.XjcRdeContact; - +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; - /** Unit tests for {@code XjcObject}. */ @RunWith(JUnit4.class) public class XjcObjectTest { diff --git a/javatests/google/registry/xjc/XmlTestdataTest.java b/javatests/google/registry/xjc/XmlTestdataTest.java index 7bbb8536d..82223f388 100644 --- a/javatests/google/registry/xjc/XmlTestdataTest.java +++ b/javatests/google/registry/xjc/XmlTestdataTest.java @@ -21,7 +21,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import google.registry.xjc.epp.XjcEpp; import google.registry.xjc.rde.XjcRdeDeposit; - +import java.io.ByteArrayInputStream; import org.junit.Rule; import org.junit.experimental.theories.DataPoints; import org.junit.experimental.theories.Theories; @@ -29,8 +29,6 @@ import org.junit.experimental.theories.Theory; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; -import java.io.ByteArrayInputStream; - /** * Unit tests that ensure {@link XjcObject} is able to unmarshal XML in {@code testdata/} and * ensure they conform to the XML schema definitions. diff --git a/javatests/google/registry/xml/XmlTestUtils.java b/javatests/google/registry/xml/XmlTestUtils.java index 0aa008c6f..ef10ed09f 100644 --- a/javatests/google/registry/xml/XmlTestUtils.java +++ b/javatests/google/registry/xml/XmlTestUtils.java @@ -23,18 +23,15 @@ import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; import com.google.common.net.InternetDomainName; - -import org.joda.time.format.ISODateTimeFormat; -import org.json.JSONArray; -import org.json.JSONObject; -import org.json.XML; - import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; - import javax.annotation.Nullable; +import org.joda.time.format.ISODateTimeFormat; +import org.json.JSONArray; +import org.json.JSONObject; +import org.json.XML; /** Helper class for unit tests that need XML. */ public class XmlTestUtils {