Format some imports using fix_imports.py

Unfortunately this tool isn't smart enough to deal with the assertThat
situation (which has two static imports of a function with the same name).

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

java/google/registry/bigquery/BigqueryFactory.java

@@ -14,7 +14,6 @@
 
 package google.registry.bigquery;
 
-
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.Sets.newConcurrentHashSet;
 import static google.registry.util.FormattingLogger.getLoggerForCallerClass;

java/google/registry/config/RdapNoticeDescriptor.java

@@ -18,33 +18,35 @@ import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
 import javax.annotation.Nullable;
 
-  /**
+/**
-   * AutoValue class describing an RDAP Notice object.
+ * AutoValue class describing an RDAP Notice object.
-   *
+ *
-   * <p>This is used for injecting RDAP help pages.
+ * <p>This is used for injecting RDAP help pages.
-   */
+ */
-  @AutoValue
+@AutoValue
-  public abstract class RdapNoticeDescriptor {
+public abstract class RdapNoticeDescriptor {
-    public static Builder builder() {
-      return new AutoValue_RdapNoticeDescriptor.Builder();
-    }
 
-    @Nullable public abstract String getTitle();
+  public static Builder builder() {
-    public abstract ImmutableList<String> getDescription();
+    return new AutoValue_RdapNoticeDescriptor.Builder();
-    @Nullable public abstract String getTypeString();
-    @Nullable public abstract String getLinkValueSuffix();
-    @Nullable public abstract String getLinkHrefUrlString();
-
-    /** Builder class for {@link RdapNoticeDescriptor}. */
-    @AutoValue.Builder
-    public abstract static class Builder {
-      public abstract Builder setTitle(@Nullable String title);
-      public abstract Builder setDescription(Iterable<String> description);
-      public abstract Builder setTypeString(@Nullable String typeString);
-      public abstract Builder setLinkValueSuffix(@Nullable String linkValueSuffix);
-      public abstract Builder setLinkHrefUrlString(@Nullable String linkHrefUrlString);
-
-      public abstract RdapNoticeDescriptor build();
-    }
   }
 
+  @Nullable public abstract String getTitle();
+  public abstract ImmutableList<String> getDescription();
+  @Nullable public abstract String getTypeString();
+  @Nullable public abstract String getLinkValueSuffix();
+  @Nullable public abstract String getLinkHrefUrlString();
+
+  /** Builder class for {@link RdapNoticeDescriptor}. */
+  @AutoValue.Builder
+  public abstract static class Builder {
+
+    public abstract Builder setTitle(@Nullable String title);
+    public abstract Builder setDescription(Iterable<String> description);
+    public abstract Builder setTypeString(@Nullable String typeString);
+    public abstract Builder setLinkValueSuffix(@Nullable String linkValueSuffix);
+    public abstract Builder setLinkHrefUrlString(@Nullable String linkHrefUrlString);
+
+    public abstract RdapNoticeDescriptor build();
+  }
+}
+

java/google/registry/keyring/api/ComparatorKeyring.java

@@ -16,19 +16,15 @@ package google.registry.keyring.api;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
-
 import google.registry.util.ComparingInvocationHandler;
 import google.registry.util.FormattingLogger;
-
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Objects;
-
 import javax.annotation.Nullable;
-
 import org.bouncycastle.bcpg.BCPGKey;
 import org.bouncycastle.bcpg.PublicKeyPacket;
 import org.bouncycastle.openpgp.PGPKeyPair;

java/google/registry/keyring/api/DummyKeyringModule.java

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package google.registry.keyring.api;
+
 import static com.google.common.io.Resources.getResource;
 import static google.registry.keyring.api.PgpHelper.KeyRequirement.ENCRYPT_SIGN;
 import static google.registry.keyring.api.PgpHelper.lookupKeyPair;

java/google/registry/keyring/kms/KmsUpdater.java

@@ -43,14 +43,11 @@ import google.registry.keyring.kms.KmsKeyring.PublicKeyLabel;
 import google.registry.keyring.kms.KmsKeyring.StringKeyLabel;
 import google.registry.model.server.KmsSecret;
 import google.registry.model.server.KmsSecretRevision;
-
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
-
 import javax.inject.Inject;
-
 import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.openpgp.PGPKeyPair;
 import org.bouncycastle.openpgp.PGPPublicKey;

java/google/registry/model/contact/ContactInfoData.java

@@ -28,7 +28,6 @@ import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.joda.time.DateTime;
 
-
 /** The {@link ResponseData} returned for an EPP info flow on a contact. */
 @XmlRootElement(name = "infData")
 @XmlType(propOrder = {

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

@@ -14,7 +14,6 @@
 
 package google.registry.model.domain;
 
-
 import com.googlecode.objectify.annotation.Embed;
 import google.registry.model.ImmutableObject;
 import javax.xml.bind.annotation.XmlAttribute;

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

@@ -24,4 +24,3 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlNs;
 import javax.xml.bind.annotation.XmlNsForm;
 import javax.xml.bind.annotation.XmlSchema;
-

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

@@ -24,4 +24,3 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlNs;
 import javax.xml.bind.annotation.XmlNsForm;
 import javax.xml.bind.annotation.XmlSchema;
-

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

@@ -24,4 +24,3 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlNs;
 import javax.xml.bind.annotation.XmlNsForm;
 import javax.xml.bind.annotation.XmlSchema;
-

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

@@ -24,4 +24,3 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlNs;
 import javax.xml.bind.annotation.XmlNsForm;
 import javax.xml.bind.annotation.XmlSchema;
-

java/google/registry/model/host/HostInfoData.java

@@ -26,7 +26,6 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import org.joda.time.DateTime;
 
-
 /** The {@link ResponseData} returned for an EPP info flow on a host. */
 @XmlRootElement(name = "infData")
 @XmlType(propOrder = {

java/google/registry/model/ofy/OfyFilter.java

@@ -14,7 +14,6 @@
 
 package google.registry.model.ofy;
 
-
 import java.io.IOException;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;

java/google/registry/model/poll/PendingActionNotificationResponse.java

@@ -14,7 +14,6 @@
 
 package google.registry.model.poll;
 
-
 import com.google.common.annotations.VisibleForTesting;
 import com.googlecode.objectify.annotation.Embed;
 import google.registry.model.ImmutableObject;

java/google/registry/monitoring/metrics/AbstractMetric.java

@@ -14,7 +14,6 @@
 
 package google.registry.monitoring.metrics;
 
-
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableSet;
 import google.registry.monitoring.metrics.MetricSchema.Kind;

java/google/registry/monitoring/metrics/StoredMetric.java

@@ -14,7 +14,6 @@
 
 package google.registry.monitoring.metrics;
 
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;

java/google/registry/rde/PendingDeposit.java

@@ -18,7 +18,6 @@ import com.google.auto.value.AutoValue;
 import google.registry.model.common.Cursor.CursorType;
 import google.registry.model.rde.RdeMode;
 import java.io.Serializable;
-import java.util.Optional;
 import javax.annotation.Nullable;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;

javatests/google/registry/flows/host/HostDeleteFlowTest.java

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package google.registry.flows.host;
+
 import static google.registry.testing.DatastoreHelper.assertNoBillingEvents;
 import static google.registry.testing.DatastoreHelper.createTld;
 import static google.registry.testing.DatastoreHelper.newDomainApplication;

javatests/google/registry/flows/session/LoginFlowViaConsoleTest.java

@@ -14,7 +14,6 @@
 
 package google.registry.flows.session;
 
-
 import static google.registry.testing.DatastoreHelper.loadRegistrar;
 import static google.registry.testing.DatastoreHelper.persistResource;
 

javatests/google/registry/tools/LevelDbUtil.java

@@ -15,6 +15,7 @@
 package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
+
 import google.registry.tools.LevelDbLogReader.ChunkType;
 
 class LevelDbUtil {
@@ -73,7 +74,9 @@ class LevelDbUtil {
    */
   static int addRecord(byte[] bytes, int pos, ChunkType type, byte[] data) {
     checkArgument(
-        data.length < MAX_RECORD, "Record length (%d) > max record size (%d)", data.length,
+        data.length < MAX_RECORD,
+        "Record length (%s) > max record size (%s)",
+        data.length,
         MAX_RECORD);
     pos = addRecordHeader(bytes, pos, type, data.length);