diff --git a/java/google/registry/bigquery/BigqueryFactory.java b/java/google/registry/bigquery/BigqueryFactory.java index 2b79ab72e..980b5d81f 100644 --- a/java/google/registry/bigquery/BigqueryFactory.java +++ b/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; diff --git a/java/google/registry/config/RdapNoticeDescriptor.java b/java/google/registry/config/RdapNoticeDescriptor.java index 710c511c7..1686d0f7e 100644 --- a/java/google/registry/config/RdapNoticeDescriptor.java +++ b/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. - * - *

This is used for injecting RDAP help pages. - */ - @AutoValue - public abstract class RdapNoticeDescriptor { - public static Builder builder() { - return new AutoValue_RdapNoticeDescriptor.Builder(); - } +/** + * AutoValue class describing an RDAP Notice object. + * + *

This is used for injecting RDAP help pages. + */ +@AutoValue +public abstract class RdapNoticeDescriptor { - @Nullable public abstract String getTitle(); - public abstract ImmutableList 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 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(); - } + public static Builder builder() { + return new AutoValue_RdapNoticeDescriptor.Builder(); } + @Nullable public abstract String getTitle(); + public abstract ImmutableList 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 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(); + } +} + diff --git a/java/google/registry/keyring/api/ComparatorKeyring.java b/java/google/registry/keyring/api/ComparatorKeyring.java index 1fc1bc792..17d61e15c 100644 --- a/java/google/registry/keyring/api/ComparatorKeyring.java +++ b/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; diff --git a/java/google/registry/keyring/api/DummyKeyringModule.java b/java/google/registry/keyring/api/DummyKeyringModule.java index 88607f970..b9212c20f 100644 --- a/java/google/registry/keyring/api/DummyKeyringModule.java +++ b/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; diff --git a/java/google/registry/keyring/kms/KmsUpdater.java b/java/google/registry/keyring/kms/KmsUpdater.java index cf9dc1598..2d040a31b 100644 --- a/java/google/registry/keyring/kms/KmsUpdater.java +++ b/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; diff --git a/java/google/registry/model/contact/ContactInfoData.java b/java/google/registry/model/contact/ContactInfoData.java index f05d926bc..3009a02f2 100644 --- a/java/google/registry/model/contact/ContactInfoData.java +++ b/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 = { diff --git a/java/google/registry/model/domain/Period.java b/java/google/registry/model/domain/Period.java index 42fb58639..0c7b71b02 100644 --- a/java/google/registry/model/domain/Period.java +++ b/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; diff --git a/java/google/registry/model/domain/metadata/package-info.java b/java/google/registry/model/domain/metadata/package-info.java index a490e6c2b..c0c70f1b4 100644 --- a/java/google/registry/model/domain/metadata/package-info.java +++ b/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; - diff --git a/java/google/registry/model/domain/rgp/package-info.java b/java/google/registry/model/domain/rgp/package-info.java index 05f3327da..a3f7c5b7b 100644 --- a/java/google/registry/model/domain/rgp/package-info.java +++ b/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; - diff --git a/java/google/registry/model/domain/secdns/package-info.java b/java/google/registry/model/domain/secdns/package-info.java index ca7bd042b..8b91616b5 100644 --- a/java/google/registry/model/domain/secdns/package-info.java +++ b/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; - diff --git a/java/google/registry/model/eppinput/package-info.java b/java/google/registry/model/eppinput/package-info.java index 463878af9..95339b86b 100644 --- a/java/google/registry/model/eppinput/package-info.java +++ b/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; - diff --git a/java/google/registry/model/host/HostInfoData.java b/java/google/registry/model/host/HostInfoData.java index a83dab01f..fde7b6bad 100644 --- a/java/google/registry/model/host/HostInfoData.java +++ b/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 = { diff --git a/java/google/registry/model/ofy/OfyFilter.java b/java/google/registry/model/ofy/OfyFilter.java index 1fd5e9713..f2014648b 100644 --- a/java/google/registry/model/ofy/OfyFilter.java +++ b/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; diff --git a/java/google/registry/model/poll/PendingActionNotificationResponse.java b/java/google/registry/model/poll/PendingActionNotificationResponse.java index 049408758..76c7450ee 100644 --- a/java/google/registry/model/poll/PendingActionNotificationResponse.java +++ b/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; diff --git a/java/google/registry/monitoring/metrics/AbstractMetric.java b/java/google/registry/monitoring/metrics/AbstractMetric.java index 72d1bf163..68a0ee30f 100644 --- a/java/google/registry/monitoring/metrics/AbstractMetric.java +++ b/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; diff --git a/java/google/registry/monitoring/metrics/StoredMetric.java b/java/google/registry/monitoring/metrics/StoredMetric.java index 2bacccad7..a531e5cdc 100644 --- a/java/google/registry/monitoring/metrics/StoredMetric.java +++ b/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; diff --git a/java/google/registry/rde/PendingDeposit.java b/java/google/registry/rde/PendingDeposit.java index 2b46da4ef..9e40c24a6 100644 --- a/java/google/registry/rde/PendingDeposit.java +++ b/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; diff --git a/javatests/google/registry/flows/host/HostDeleteFlowTest.java b/javatests/google/registry/flows/host/HostDeleteFlowTest.java index c542517f1..9ef82f554 100644 --- a/javatests/google/registry/flows/host/HostDeleteFlowTest.java +++ b/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; diff --git a/javatests/google/registry/flows/session/LoginFlowViaConsoleTest.java b/javatests/google/registry/flows/session/LoginFlowViaConsoleTest.java index c4e83313c..78e8d4186 100644 --- a/javatests/google/registry/flows/session/LoginFlowViaConsoleTest.java +++ b/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; diff --git a/javatests/google/registry/tools/LevelDbUtil.java b/javatests/google/registry/tools/LevelDbUtil.java index 44086eb15..3026c2ec3 100644 --- a/javatests/google/registry/tools/LevelDbUtil.java +++ b/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);