diff --git a/.circleci/config.yml b/.circleci/config.yml index f1005ad0d8c..d5f4fd2ad0b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,7 +18,7 @@ jobs: - run: git tag -l | xargs git tag -d && git fetch -t # ensure all tags are fetched and up-to-date - run: ./scripts/circle-ci/download-moreutils.sh - - run: ./scripts/time-cmd.sh ./gradlew --profile --parallel --stacktrace resolveConfigurations classes testClasses + - run: ./scripts/time-cmd.sh ./gradlew --profile --parallel --stacktrace classes testClasses - save_cache: key: gradle-wrapper-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }} diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/Cleaner.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/Cleaner.java index 5117975afd7..e294b045283 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/Cleaner.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/Cleaner.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.cleaner.api; -import java.io.Closeable; - import com.google.common.collect.Multimap; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.transaction.api.TransactionManager; +import java.io.Closeable; /** * A {@link Cleaner} is good for two things: it scrubs and it punches. Scrubbing is an on-demand diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/OnCleanupTask.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/OnCleanupTask.java index a52a52249d6..71784ac9e4f 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/OnCleanupTask.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/OnCleanupTask.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.cleaner.api; -import java.util.Set; - import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.transaction.api.Transaction; +import java.util.Set; /** * This task allows us to essentially implement ON DELETE CASCADE. diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/config/LeaderConfig.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/config/LeaderConfig.java index 2cbd4c0fed6..517dbc64d8c 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/config/LeaderConfig.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/config/LeaderConfig.java @@ -15,24 +15,21 @@ */ package com.palantir.atlasdb.config; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.google.common.base.Preconditions; +import com.palantir.conjure.java.api.config.ssl.SslConfiguration; +import com.palantir.logsafe.SafeArg; import java.io.File; import java.nio.file.Files; import java.nio.file.Paths; import java.util.Optional; import java.util.Set; - import javax.validation.constraints.Size; - import org.immutables.value.Value; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.google.common.base.Preconditions; -import com.palantir.conjure.java.api.config.ssl.SslConfiguration; -import com.palantir.logsafe.SafeArg; - @JsonDeserialize(as = ImmutableLeaderConfig.class) @JsonSerialize(as = ImmutableLeaderConfig.class) @Value.Immutable diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/encoding/PtBytes.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/encoding/PtBytes.java index 3c3254c8f19..a63ab693b09 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/encoding/PtBytes.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/encoding/PtBytes.java @@ -15,10 +15,6 @@ */ package com.palantir.atlasdb.encoding; -import java.nio.charset.StandardCharsets; - -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.base.MoreObjects; import com.google.common.cache.Cache; @@ -27,6 +23,8 @@ import com.google.common.io.BaseEncoding; import com.google.common.primitives.Longs; import com.google.common.primitives.UnsignedBytes; +import java.nio.charset.StandardCharsets; +import javax.annotation.Nullable; public final class PtBytes { private PtBytes() { } diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/factory/TransactionManagerConsistencyResult.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/factory/TransactionManagerConsistencyResult.java index 2f5c7f49860..5dc1ec654c8 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/factory/TransactionManagerConsistencyResult.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/factory/TransactionManagerConsistencyResult.java @@ -16,7 +16,6 @@ package com.palantir.atlasdb.factory; import java.util.Optional; - import org.immutables.value.Value; /** diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/BatchColumnRangeSelection.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/BatchColumnRangeSelection.java index e2f7dc7e738..4e6f1695c34 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/BatchColumnRangeSelection.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/BatchColumnRangeSelection.java @@ -15,14 +15,13 @@ */ package com.palantir.atlasdb.keyvalue.api; -import java.io.Serializable; -import java.util.regex.Pattern; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.encoding.PtBytes; +import java.io.Serializable; +import java.util.regex.Pattern; public final class BatchColumnRangeSelection implements Serializable { private static final long serialVersionUID = 1L; diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CandidateCellForSweeping.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CandidateCellForSweeping.java index a8d1cd3e5fb..6298234ad9d 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CandidateCellForSweeping.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CandidateCellForSweeping.java @@ -16,7 +16,6 @@ package com.palantir.atlasdb.keyvalue.api; import java.util.Collection; - import org.immutables.value.Value; @Value.Immutable diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CandidateCellForSweepingRequest.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CandidateCellForSweepingRequest.java index ad7cd6e88c2..37a945d9f3b 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CandidateCellForSweepingRequest.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CandidateCellForSweepingRequest.java @@ -16,7 +16,6 @@ package com.palantir.atlasdb.keyvalue.api; import java.util.OptionalInt; - import org.immutables.value.Value; @Value.Immutable diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Cell.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Cell.java index 28ab1ef93df..07e4329d003 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Cell.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Cell.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.api; -import java.io.Serializable; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; - -import javax.annotation.Nonnull; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.MoreObjects; @@ -33,6 +24,12 @@ import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; +import java.io.Serializable; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import javax.annotation.Nonnull; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Represents a cell in the key-value store. @@ -74,7 +71,7 @@ private void validateNameValid(byte[] name) { + "debugging to know the UTF-8 interpretation of the bad field was: [{}]", SafeArg.of("max name length", MAX_NAME_LENGTH), UnsafeArg.of("cell", this), - UnsafeArg.of("name", new String(name, StandardCharsets.UTF_8))); + UnsafeArg.of("name", new String(name, StandardCharsets.UTF_8)), e); throw e; } } diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetCompatibility.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetCompatibility.java index 2e5ebd44a22..55ca07115eb 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetCompatibility.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetCompatibility.java @@ -16,12 +16,11 @@ package com.palantir.atlasdb.keyvalue.api; +import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; - /** * Indicates whether a {@link KeyValueService} supports check and set (CAS) and put unless exists (PUE) operations, and * if so the granularity with which it can provide feedback. diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetRequest.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetRequest.java index a0dd1f668f7..e9260f12d4a 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetRequest.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetRequest.java @@ -15,15 +15,12 @@ */ package com.palantir.atlasdb.keyvalue.api; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Optional; - import javax.annotation.Nullable; - import org.immutables.value.Value; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; - /** * A request to be supplied to KeyValueService.checkAndSet. * Use {@link #newCell(TableReference, Cell, byte[])} if the Cell is not yet stored, diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelection.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelection.java index 7e22275970a..137758299e8 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelection.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelection.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.api; -import java.io.Serializable; -import java.util.Arrays; -import java.util.Objects; -import java.util.regex.Pattern; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Joiner; @@ -27,6 +22,10 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.encoding.PtBytes; +import java.io.Serializable; +import java.util.Arrays; +import java.util.Objects; +import java.util.regex.Pattern; public class ColumnRangeSelection implements Serializable { private static final long serialVersionUID = 1L; diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelections.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelections.java index 36117560837..6e18288cdf2 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelections.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelections.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.keyvalue.api; -import java.io.Serializable; - import com.palantir.common.persist.Persistable; import com.palantir.logsafe.Preconditions; +import java.io.Serializable; public final class ColumnRangeSelections implements Serializable { private static final long serialVersionUID = 1L; diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnSelection.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnSelection.java index a31c28b0256..95c09576da6 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnSelection.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnSelection.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.api; -import java.io.Serializable; -import java.util.Collection; -import java.util.Collections; -import java.util.Set; -import java.util.SortedSet; - import com.google.common.base.Joiner; import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableSortedSet; @@ -29,6 +23,11 @@ import com.google.common.primitives.UnsignedBytes; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.logsafe.Preconditions; +import java.io.Serializable; +import java.util.Collection; +import java.util.Collections; +import java.util.Set; +import java.util.SortedSet; public final class ColumnSelection implements Serializable { private static final long serialVersionUID = 1L; diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsException.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsException.java index 9f8db2ec5b8..e4c3aa96c76 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsException.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsException.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.keyvalue.api; +import com.google.common.base.MoreObjects; +import com.google.common.collect.ImmutableList; import java.io.IOException; import java.io.ObjectInputStream; import java.util.Collection; -import com.google.common.base.MoreObjects; -import com.google.common.collect.ImmutableList; - /** * A {@link KeyAlreadyExistsException} is thrown if an operation that conditionally updates a {@link KeyValueService} * fails because some data is already present in the underlying database. diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyValueService.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyValueService.java index 66ca72d87eb..2078cf7b93d 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyValueService.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyValueService.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.api; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.google.common.collect.Multimap; import com.palantir.atlasdb.transaction.api.TransactionManager; import com.palantir.common.annotation.Idempotent; @@ -29,6 +24,10 @@ import com.palantir.processors.AutoDelegate; import com.palantir.util.paging.BasicResultsPage; import com.palantir.util.paging.TokenBackedBasicResultsPage; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * A service which stores key-value pairs. diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Namespace.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Namespace.java index 1f18ad7e2fe..8da20e1414b 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Namespace.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Namespace.java @@ -15,15 +15,13 @@ */ package com.palantir.atlasdb.keyvalue.api; -import java.util.regex.Pattern; - -import org.apache.commons.lang3.Validate; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Objects; import com.palantir.logsafe.Preconditions; +import java.util.regex.Pattern; +import org.apache.commons.lang3.Validate; public final class Namespace { public static final Namespace EMPTY_NAMESPACE = new Namespace(""); diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Prefix.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Prefix.java index 26a6b987bba..ed44628f658 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Prefix.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Prefix.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.keyvalue.api; -import javax.annotation.Nonnull; - import com.palantir.common.annotation.Immutable; import com.palantir.logsafe.Preconditions; +import javax.annotation.Nonnull; /** * Represents a partial row to be used for range requests. diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequest.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequest.java index ee19091f2a2..3e6997d7f20 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequest.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequest.java @@ -15,16 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.api; -import java.io.Serializable; -import java.util.Arrays; -import java.util.Objects; -import java.util.Set; -import java.util.SortedSet; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.annotation.concurrent.NotThreadSafe; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; @@ -42,6 +32,14 @@ import com.palantir.common.persist.Persistable; import com.palantir.logsafe.Preconditions; import com.palantir.util.Pair; +import java.io.Serializable; +import java.util.Arrays; +import java.util.Objects; +import java.util.Set; +import java.util.SortedSet; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import javax.annotation.concurrent.NotThreadSafe; /** * Allows you to restrict a call on the database diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequests.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequests.java index 0b0e4f7fc79..0e4fd07db2b 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequests.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequests.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.keyvalue.api; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.primitives.UnsignedBytes; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public final class RangeRequests { private RangeRequests() { diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RetryLimitReachedException.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RetryLimitReachedException.java index 7c98a33637b..8d182b5a84c 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RetryLimitReachedException.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RetryLimitReachedException.java @@ -16,11 +16,10 @@ package com.palantir.atlasdb.keyvalue.api; +import com.palantir.common.exception.AtlasDbDependencyException; import java.util.Arrays; import java.util.List; -import com.palantir.common.exception.AtlasDbDependencyException; - public class RetryLimitReachedException extends AtlasDbDependencyException { private static final String MESSAGE = "Request was retried %d times and failed each time for the request."; diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RowResult.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RowResult.java index ce2ca58190b..67fc4772597 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RowResult.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RowResult.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.api; -import java.io.Serializable; -import java.util.Arrays; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; - import com.google.common.base.Function; import com.google.common.base.MoreObjects; import com.google.common.collect.Collections2; @@ -33,6 +27,11 @@ import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.common.collect.Maps2; import com.palantir.logsafe.Preconditions; +import java.io.Serializable; +import java.util.Arrays; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; public final class RowResult implements Serializable { private static final long serialVersionUID = 1L; diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/SweepResults.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/SweepResults.java index 3cb71f10cde..bcf766431f3 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/SweepResults.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/SweepResults.java @@ -15,17 +15,14 @@ */ package com.palantir.atlasdb.keyvalue.api; -import java.util.Optional; - -import javax.annotation.Nullable; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palantir.atlasdb.encoding.PtBytes; +import java.util.Optional; +import javax.annotation.Nullable; +import org.immutables.value.Value; @JsonDeserialize(as = ImmutableSweepResults.class) @JsonSerialize(as = ImmutableSweepResults.class) diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TableReference.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TableReference.java index eb185f128ec..c818bcc4a55 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TableReference.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TableReference.java @@ -15,14 +15,12 @@ */ package com.palantir.atlasdb.keyvalue.api; -import java.util.Objects; - -import org.apache.commons.lang3.StringUtils; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; +import java.util.Objects; +import org.apache.commons.lang3.StringUtils; public final class TableReference { private final Namespace namespace; diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TargetedSweepMetadata.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TargetedSweepMetadata.java index 2c4be1c2801..4791c2ba4ad 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TargetedSweepMetadata.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TargetedSweepMetadata.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.keyvalue.api; -import org.immutables.value.Value; - import com.google.common.base.Preconditions; import com.palantir.common.persist.Persistable; +import org.immutables.value.Value; @Value.Immutable public abstract class TargetedSweepMetadata implements Persistable { diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Value.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Value.java index 043f8456b49..95125c817cf 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Value.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Value.java @@ -15,18 +15,16 @@ */ package com.palantir.atlasdb.keyvalue.api; -import java.io.Serializable; -import java.util.Arrays; -import java.util.Objects; - -import javax.annotation.Nonnull; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Function; import com.google.common.base.MoreObjects; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.logsafe.Preconditions; +import java.io.Serializable; +import java.util.Arrays; +import java.util.Objects; +import javax.annotation.Nonnull; /** * Represents a value in the key-value store (including its timestamp). diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java index 56a673c2e5f..7e73d735a9e 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java @@ -15,19 +15,17 @@ */ package com.palantir.atlasdb.spi; -import java.util.Optional; -import java.util.function.LongSupplier; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.palantir.atlasdb.config.LeaderConfig; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.util.MetricsManager; import com.palantir.timestamp.ManagedTimestampService; import com.palantir.timestamp.TimestampStoreInvalidator; +import java.util.Optional; +import java.util.function.LongSupplier; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public interface AtlasDbFactory { Logger log = LoggerFactory.getLogger(AtlasDbFactory.class); diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/KeyValueServiceConfig.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/KeyValueServiceConfig.java index 054a21eb359..ac30d04c0b6 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/KeyValueServiceConfig.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/KeyValueServiceConfig.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.spi; -import java.util.Optional; - import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo.As; import com.fasterxml.jackson.annotation.JsonTypeInfo.Id; +import java.util.Optional; /** * Marker interface for various AtlasDb KeyValueService config objects. diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckable.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckable.java index df536c363bf..2a55a8d1c65 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckable.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckable.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.transaction.api; +import com.palantir.atlasdb.keyvalue.api.Cell; import java.util.List; import java.util.Map; -import com.palantir.atlasdb.keyvalue.api.Cell; - public interface ConstraintCheckable { /** * This method checks row, table, and foreign-key constraints on the values given in writes. diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckingTransaction.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckingTransaction.java index f6e1d4a2710..385539cdb90 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckingTransaction.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckingTransaction.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.transaction.api; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; - import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.RowResult; import com.palantir.atlasdb.keyvalue.api.TableReference; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; public interface ConstraintCheckingTransaction extends Transaction { /** diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/Transaction.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/Transaction.java index 4842e3a2400..d61b21af054 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/Transaction.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/Transaction.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.transaction.api; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; -import java.util.function.BiFunction; -import java.util.stream.Stream; - import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection; @@ -33,6 +26,12 @@ import com.palantir.atlasdb.transaction.service.TransactionService; import com.palantir.common.annotation.Idempotent; import com.palantir.common.base.BatchingVisitable; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.function.BiFunction; +import java.util.stream.Stream; /** * Provides the methods for a transaction with the key-value store. diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionAndImmutableTsLock.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionAndImmutableTsLock.java index 60f2ba7b33a..6ce1d045793 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionAndImmutableTsLock.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionAndImmutableTsLock.java @@ -15,9 +15,8 @@ */ package com.palantir.atlasdb.transaction.api; -import org.immutables.value.Value; - import com.palantir.lock.v2.LockToken; +import org.immutables.value.Value; @Value.Immutable public interface TransactionAndImmutableTsLock { diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionConflictException.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionConflictException.java index 04838e284c2..78a2196f278 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionConflictException.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionConflictException.java @@ -15,14 +15,13 @@ */ package com.palantir.atlasdb.transaction.api; -import java.io.Serializable; -import java.util.Collection; -import java.util.Set; - import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.TableReference; +import java.io.Serializable; +import java.util.Collection; +import java.util.Set; /** * Thrown if there is a conflict detected when a transaction is committed. diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionManager.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionManager.java index f29efc706a9..589f82be37d 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionManager.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionManager.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.transaction.api; -import java.util.function.Supplier; - import com.palantir.atlasdb.cleaner.api.Cleaner; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.transaction.service.TransactionService; @@ -29,6 +27,7 @@ import com.palantir.processors.DoNotDelegate; import com.palantir.timestamp.TimestampManagementService; import com.palantir.timestamp.TimestampService; +import java.util.function.Supplier; @AutoDelegate public interface TransactionManager extends AutoCloseable { diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/service/TransactionService.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/service/TransactionService.java index b35770bb0c4..97d8b04b5a6 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/service/TransactionService.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/service/TransactionService.java @@ -15,12 +15,10 @@ */ package com.palantir.atlasdb.transaction.service; +import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException; import java.util.Map; - import javax.annotation.CheckForNull; -import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException; - /** * Transaction service is used by the atlas protocol to determine is a given transaction has been * committed or aborted. Transaction services may assume that data tables are written at timestamps greater than diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/util/MetricNameCache.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/util/MetricNameCache.java index f3ea1012d25..a076652473c 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/util/MetricNameCache.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/util/MetricNameCache.java @@ -16,18 +16,15 @@ package com.palantir.atlasdb.util; -import java.util.Map; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.immutables.value.Value; - import com.codahale.metrics.MetricRegistry; import com.github.benmanes.caffeine.cache.CacheLoader; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import com.palantir.tritium.metrics.registry.MetricName; +import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import org.immutables.value.Value; /** Cache to avoid excessive string concatenation in MetricRegistry.name(clazz, metricName). */ final class MetricNameCache { diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/util/MetricsManager.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/util/MetricsManager.java index 39e5c98031f..e5a50b6a1ba 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/util/MetricsManager.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/util/MetricsManager.java @@ -15,6 +15,17 @@ */ package com.palantir.atlasdb.util; +import com.codahale.metrics.Gauge; +import com.codahale.metrics.Histogram; +import com.codahale.metrics.Meter; +import com.codahale.metrics.Metric; +import com.codahale.metrics.MetricRegistry; +import com.codahale.metrics.Timer; +import com.google.common.collect.ImmutableMap; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.logsafe.SafeArg; +import com.palantir.tritium.metrics.registry.MetricName; +import com.palantir.tritium.metrics.registry.TaggedMetricRegistry; import java.util.List; import java.util.Map; import java.util.Set; @@ -24,24 +35,10 @@ import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Collectors; - import javax.annotation.Nullable; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Gauge; -import com.codahale.metrics.Histogram; -import com.codahale.metrics.Meter; -import com.codahale.metrics.Metric; -import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.Timer; -import com.google.common.collect.ImmutableMap; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.logsafe.SafeArg; -import com.palantir.tritium.metrics.registry.MetricName; -import com.palantir.tritium.metrics.registry.TaggedMetricRegistry; - public class MetricsManager { private static final Logger log = LoggerFactory.getLogger(MetricsManager.class); diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/versions/AtlasDbVersion.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/versions/AtlasDbVersion.java index 41925156187..7f548996f3b 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/versions/AtlasDbVersion.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/versions/AtlasDbVersion.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.versions; +import com.google.common.base.Suppliers; import java.io.PrintStream; import java.util.Optional; import java.util.function.Supplier; -import com.google.common.base.Suppliers; - public final class AtlasDbVersion { public static final String REPORT_VERSION_PROPERTY = "atlasdb.report.version"; public static final String REPORT_VERSION_DEFAULT = "false"; @@ -54,4 +53,3 @@ public static String readVersion() { .orElse(VERSION_UNKNOWN_STRING); } } - diff --git a/atlasdb-api/src/test/java/com/palantir/atlasdb/config/LeaderConfigTest.java b/atlasdb-api/src/test/java/com/palantir/atlasdb/config/LeaderConfigTest.java index cdb3acb34b1..2afab35a75b 100644 --- a/atlasdb-api/src/test/java/com/palantir/atlasdb/config/LeaderConfigTest.java +++ b/atlasdb-api/src/test/java/com/palantir/atlasdb/config/LeaderConfigTest.java @@ -16,7 +16,6 @@ package com.palantir.atlasdb.config; import java.util.Collections; - import org.junit.Test; public class LeaderConfigTest { diff --git a/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetCompatibilityTest.java b/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetCompatibilityTest.java index 4bb3787307c..3811610421a 100644 --- a/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetCompatibilityTest.java +++ b/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetCompatibilityTest.java @@ -20,7 +20,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.stream.Stream; - import org.junit.Test; public class CheckAndSetCompatibilityTest { diff --git a/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsExceptionTest.java b/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsExceptionTest.java index 5a956ce7dd3..672b7b90026 100644 --- a/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsExceptionTest.java +++ b/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsExceptionTest.java @@ -18,17 +18,15 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.google.common.collect.ImmutableList; +import com.palantir.atlasdb.encoding.PtBytes; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.net.URL; - import org.junit.Test; -import com.google.common.collect.ImmutableList; -import com.palantir.atlasdb.encoding.PtBytes; - public class KeyAlreadyExistsExceptionTest { @Test public void canDeserializeLegacyVersionsOfException() throws IOException, ClassNotFoundException { diff --git a/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/RetryLimitReachedExceptionTest.java b/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/RetryLimitReachedExceptionTest.java index 72ec01ae7ae..0458c34a941 100644 --- a/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/RetryLimitReachedExceptionTest.java +++ b/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/RetryLimitReachedExceptionTest.java @@ -16,11 +16,10 @@ package com.palantir.atlasdb.keyvalue.api; -import org.assertj.core.api.Assertions; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.palantir.common.exception.AtlasDbDependencyException; +import org.assertj.core.api.Assertions; +import org.junit.Test; @SuppressWarnings("ThrowableInstanceNeverThrown") public class RetryLimitReachedExceptionTest { diff --git a/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/SweepResultsTest.java b/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/SweepResultsTest.java index a010f4c3a84..94e43e279b2 100644 --- a/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/SweepResultsTest.java +++ b/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/SweepResultsTest.java @@ -15,14 +15,12 @@ */ package com.palantir.atlasdb.keyvalue.api; +import com.palantir.atlasdb.encoding.PtBytes; import java.util.Optional; - import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Test; -import com.palantir.atlasdb.encoding.PtBytes; - public class SweepResultsTest { private static final SweepResults RESULTS = SweepResults.builder() .nextStartRow(Optional.of(PtBytes.toBytes("ABC"))) diff --git a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/Autobatchers.java b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/Autobatchers.java index 3ce394ed6c2..cb92cec3f99 100644 --- a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/Autobatchers.java +++ b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/Autobatchers.java @@ -16,19 +16,17 @@ package com.palantir.atlasdb.autobatch; +import com.google.common.collect.ImmutableMap; +import com.google.errorprone.annotations.CompileTimeConstant; +import com.lmax.disruptor.EventHandler; +import com.palantir.logsafe.Preconditions; import java.util.List; import java.util.Map; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; - import javax.annotation.Nullable; -import com.google.common.collect.ImmutableMap; -import com.google.errorprone.annotations.CompileTimeConstant; -import com.lmax.disruptor.EventHandler; -import com.palantir.logsafe.Preconditions; - public final class Autobatchers { private static final int DEFAULT_BUFFER_SIZE = 1024; diff --git a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/BatchSizeRecorder.java b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/BatchSizeRecorder.java index 384b8eefe8e..33e7fc10e46 100644 --- a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/BatchSizeRecorder.java +++ b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/BatchSizeRecorder.java @@ -16,11 +16,10 @@ package com.palantir.atlasdb.autobatch; -import javax.annotation.concurrent.NotThreadSafe; - import com.codahale.metrics.Histogram; import com.palantir.tritium.metrics.registry.MetricName; import com.palantir.tritium.metrics.registry.SharedTaggedMetricRegistries; +import javax.annotation.concurrent.NotThreadSafe; @NotThreadSafe // Disruptor runs the batching function on just one thread. public final class BatchSizeRecorder { diff --git a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/CoalescingBatchingEventHandler.java b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/CoalescingBatchingEventHandler.java index d4dd8927fa3..4f351af2bb7 100644 --- a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/CoalescingBatchingEventHandler.java +++ b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/CoalescingBatchingEventHandler.java @@ -16,16 +16,14 @@ package com.palantir.atlasdb.autobatch; -import java.util.Map; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.HashMultimap; import com.google.common.collect.SetMultimap; import com.google.common.util.concurrent.SettableFuture; import com.lmax.disruptor.EventHandler; import com.palantir.logsafe.SafeArg; +import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; final class CoalescingBatchingEventHandler implements EventHandler> { diff --git a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/CoalescingRequestSupplier.java b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/CoalescingRequestSupplier.java index 0f7238257d4..e5439defc7f 100644 --- a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/CoalescingRequestSupplier.java +++ b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/CoalescingRequestSupplier.java @@ -16,12 +16,11 @@ package com.palantir.atlasdb.autobatch; +import com.palantir.logsafe.Preconditions; import java.util.Map; import java.util.Set; import java.util.function.Supplier; -import com.palantir.logsafe.Preconditions; - public final class CoalescingRequestSupplier implements CoalescingRequestFunction { private final Supplier supplier; diff --git a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/DisruptorAutobatcher.java b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/DisruptorAutobatcher.java index b014388d3d6..5d1e6e2d2bd 100644 --- a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/DisruptorAutobatcher.java +++ b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/DisruptorAutobatcher.java @@ -16,11 +16,6 @@ package com.palantir.atlasdb.autobatch; -import java.io.Closeable; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ThreadFactory; -import java.util.function.Function; - import com.google.common.collect.Maps; import com.google.common.util.concurrent.AsyncFunction; import com.google.common.util.concurrent.ListenableFuture; @@ -30,6 +25,10 @@ import com.lmax.disruptor.RingBuffer; import com.lmax.disruptor.dsl.Disruptor; import com.palantir.logsafe.Preconditions; +import java.io.Closeable; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ThreadFactory; +import java.util.function.Function; /** * While this class is public, it shouldn't be used as API outside of AtlasDB because we diff --git a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/IndependentBatchingEventHandler.java b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/IndependentBatchingEventHandler.java index d19383d7cac..0d71cddbe25 100644 --- a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/IndependentBatchingEventHandler.java +++ b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/IndependentBatchingEventHandler.java @@ -16,13 +16,12 @@ package com.palantir.atlasdb.autobatch; +import com.lmax.disruptor.EventHandler; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.function.Consumer; -import com.lmax.disruptor.EventHandler; - final class IndependentBatchingEventHandler implements EventHandler> { private final Consumer>> batchFunction; private final List> pending; diff --git a/atlasdb-autobatch/src/test/java/com/palantir/atlasdb/autobatch/BatchSizeRecorderTest.java b/atlasdb-autobatch/src/test/java/com/palantir/atlasdb/autobatch/BatchSizeRecorderTest.java index 37b30b01520..b86b8d3aa5c 100644 --- a/atlasdb-autobatch/src/test/java/com/palantir/atlasdb/autobatch/BatchSizeRecorderTest.java +++ b/atlasdb-autobatch/src/test/java/com/palantir/atlasdb/autobatch/BatchSizeRecorderTest.java @@ -18,11 +18,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.codahale.metrics.Histogram; import com.palantir.tritium.metrics.registry.MetricName; import com.palantir.tritium.metrics.registry.SharedTaggedMetricRegistries; +import org.junit.Test; public class BatchSizeRecorderTest { private static final String SAFE_IDENTIFIER = "identifier"; diff --git a/atlasdb-autobatch/src/test/java/com/palantir/atlasdb/autobatch/CoalescingBatchingEventHandlerTests.java b/atlasdb-autobatch/src/test/java/com/palantir/atlasdb/autobatch/CoalescingBatchingEventHandlerTests.java index 8d16ef55311..87c0552480a 100644 --- a/atlasdb-autobatch/src/test/java/com/palantir/atlasdb/autobatch/CoalescingBatchingEventHandlerTests.java +++ b/atlasdb-autobatch/src/test/java/com/palantir/atlasdb/autobatch/CoalescingBatchingEventHandlerTests.java @@ -22,21 +22,19 @@ import static org.mockito.ArgumentMatchers.anySet; 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 com.google.common.util.concurrent.SettableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicLong; - import org.immutables.value.Value; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.google.common.util.concurrent.SettableFuture; - @RunWith(MockitoJUnitRunner.class) public class CoalescingBatchingEventHandlerTests { diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraBackgroundSweeperIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraBackgroundSweeperIntegrationTest.java index cb28d64886e..783ea463960 100644 --- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraBackgroundSweeperIntegrationTest.java +++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraBackgroundSweeperIntegrationTest.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import org.junit.ClassRule; - import com.palantir.atlasdb.containers.CassandraResource; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.sweep.AbstractBackgroundSweeperIntegrationTest; import com.palantir.atlasdb.util.MetricsManagers; +import org.junit.ClassRule; public class CassandraBackgroundSweeperIntegrationTest extends AbstractBackgroundSweeperIntegrationTest { @ClassRule diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolIntegrationTest.java index d9e39ef4f6b..b8f609b5b18 100644 --- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolIntegrationTest.java +++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolIntegrationTest.java @@ -21,27 +21,25 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Range; +import com.palantir.atlasdb.cassandra.ImmutableCassandraKeyValueServiceConfig; +import com.palantir.atlasdb.containers.CassandraResource; +import com.palantir.atlasdb.util.MetricsManager; +import com.palantir.atlasdb.util.MetricsManagers; +import com.palantir.common.base.FunctionCheckedException; import java.net.InetSocketAddress; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; import java.util.Map.Entry; - import org.apache.cassandra.thrift.KsDef; import org.apache.cassandra.thrift.TokenRange; import org.apache.thrift.TException; import org.junit.ClassRule; import org.junit.Test; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Range; -import com.palantir.atlasdb.cassandra.ImmutableCassandraKeyValueServiceConfig; -import com.palantir.atlasdb.containers.CassandraResource; -import com.palantir.atlasdb.util.MetricsManager; -import com.palantir.atlasdb.util.MetricsManagers; -import com.palantir.common.base.FunctionCheckedException; - public class CassandraClientPoolIntegrationTest { @ClassRule public static final CassandraResource CASSANDRA = new CassandraResource(); diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConnectionIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConnectionIntegrationTest.java index 071a1bcd611..681d245f35f 100644 --- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConnectionIntegrationTest.java +++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConnectionIntegrationTest.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.palantir.atlasdb.containers.CassandraResource; import org.junit.ClassRule; import org.junit.Test; -import com.palantir.atlasdb.containers.CassandraResource; - public class CassandraConnectionIntegrationTest { @ClassRule public static final CassandraResource CASSANDRA = new CassandraResource(); diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraGetCandidateCellsForSweepingTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraGetCandidateCellsForSweepingTest.java index 31cdb612b4f..2a78d21f6c3 100644 --- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraGetCandidateCellsForSweepingTest.java +++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraGetCandidateCellsForSweepingTest.java @@ -17,14 +17,13 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.ClassRule; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.containers.CassandraResource; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.ImmutableCandidateCellForSweeping; import com.palantir.atlasdb.keyvalue.impl.AbstractGetCandidateCellsForSweepingTest; +import org.junit.ClassRule; +import org.junit.Test; public class CassandraGetCandidateCellsForSweepingTest extends AbstractGetCandidateCellsForSweepingTest { @ClassRule diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceAsyncInitializationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceAsyncInitializationTest.java index 3a5a3a8b28b..54213d6da0b 100644 --- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceAsyncInitializationTest.java +++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceAsyncInitializationTest.java @@ -17,16 +17,14 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.palantir.atlasdb.containers.UninitializedCassandraResource; +import com.palantir.atlasdb.keyvalue.api.KeyValueService; import java.io.IOException; import java.util.concurrent.TimeUnit; - import org.awaitility.Awaitility; import org.junit.ClassRule; import org.junit.Test; -import com.palantir.atlasdb.containers.UninitializedCassandraResource; -import com.palantir.atlasdb.keyvalue.api.KeyValueService; - public class CassandraKeyValueServiceAsyncInitializationTest { @ClassRule public static final UninitializedCassandraResource CASSANDRA = new UninitializedCassandraResource( diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceGetRowKeysInRangeTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceGetRowKeysInRangeTest.java index 29eab2468c4..bd64cb016fe 100644 --- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceGetRowKeysInRangeTest.java +++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceGetRowKeysInRangeTest.java @@ -20,17 +20,6 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertThat; -import java.util.List; -import java.util.concurrent.ThreadLocalRandom; -import java.util.stream.Collectors; -import java.util.stream.IntStream; -import java.util.stream.Stream; - -import org.junit.After; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.palantir.atlasdb.containers.CassandraResource; @@ -40,8 +29,16 @@ import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.atlasdb.table.description.TableMetadata; import com.palantir.common.random.RandomBytes; - +import java.util.List; +import java.util.concurrent.ThreadLocalRandom; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import java.util.stream.Stream; import okio.ByteString; +import org.junit.After; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; public class CassandraKeyValueServiceGetRowKeysInRangeTest { private static final TableReference GET_ROW_KEYS_TABLE = TableReference.createFromFullyQualifiedName("test.rows"); diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceIntegrationTest.java index 44e52161b8d..b8743da0654 100644 --- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceIntegrationTest.java +++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceIntegrationTest.java @@ -15,6 +15,9 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import static com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceTestUtils.ORIGINAL_METADATA; +import static com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceTestUtils.clearOutMetadataTable; +import static com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceTestUtils.insertGenericMetadataIntoLegacyCell; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.lessThanOrEqualTo; @@ -28,27 +31,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceTestUtils.ORIGINAL_METADATA; -import static com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceTestUtils.clearOutMetadataTable; -import static com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceTestUtils.insertGenericMetadataIntoLegacyCell; - -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -import org.apache.cassandra.thrift.CfDef; -import org.apache.cassandra.thrift.Compression; -import org.apache.cassandra.thrift.ConsistencyLevel; -import org.apache.commons.lang3.RandomStringUtils; -import org.apache.thrift.TException; -import org.junit.ClassRule; -import org.junit.Ignore; -import org.junit.Test; -import org.slf4j.Logger; - import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; @@ -78,6 +60,21 @@ import com.palantir.atlasdb.util.MetricsManagers; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import org.apache.cassandra.thrift.CfDef; +import org.apache.cassandra.thrift.Compression; +import org.apache.cassandra.thrift.ConsistencyLevel; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.thrift.TException; +import org.junit.ClassRule; +import org.junit.Ignore; +import org.junit.Test; +import org.slf4j.Logger; public class CassandraKeyValueServiceIntegrationTest extends AbstractKeyValueServiceTest { private static final Logger logger = mock(Logger.class); diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceMultiCasIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceMultiCasIntegrationTest.java index 11f237ac40f..c2660e04d15 100644 --- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceMultiCasIntegrationTest.java +++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceMultiCasIntegrationTest.java @@ -16,10 +16,9 @@ package com.palantir.atlasdb.keyvalue.cassandra; -import org.junit.ClassRule; - import com.palantir.atlasdb.containers.CassandraResource; import com.palantir.atlasdb.keyvalue.impl.AbstractMultiCasTest; +import org.junit.ClassRule; public class CassandraKeyValueServiceMultiCasIntegrationTest extends AbstractMultiCasTest { @ClassRule diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceSweepTaskRunnerIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceSweepTaskRunnerIntegrationTest.java index c6eaf933def..63654ee94b1 100644 --- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceSweepTaskRunnerIntegrationTest.java +++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceSweepTaskRunnerIntegrationTest.java @@ -15,17 +15,16 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import org.apache.commons.lang3.RandomStringUtils; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Test; - import com.palantir.atlasdb.containers.CassandraResource; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.SweepResults; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.atlasdb.sweep.AbstractSweepTaskRunnerTest; import com.palantir.atlasdb.util.MetricsManagers; +import org.apache.commons.lang3.RandomStringUtils; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.Test; public class CassandraKeyValueServiceSweepTaskRunnerIntegrationTest extends AbstractSweepTaskRunnerTest { @ClassRule diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTableCreationIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTableCreationIntegrationTest.java index 6a52dc43668..a913623ca67 100644 --- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTableCreationIntegrationTest.java +++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTableCreationIntegrationTest.java @@ -19,20 +19,6 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import java.nio.charset.StandardCharsets; -import java.util.concurrent.BrokenBarrierException; -import java.util.concurrent.CyclicBarrier; -import java.util.concurrent.ForkJoinPool; -import java.util.concurrent.TimeUnit; -import java.util.stream.IntStream; - -import org.apache.cassandra.thrift.CfDef; -import org.apache.cassandra.thrift.KsDef; -import org.apache.thrift.TException; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Test; - import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; @@ -50,6 +36,18 @@ import com.palantir.atlasdb.table.description.ValueType; import com.palantir.atlasdb.transaction.api.ConflictHandler; import com.palantir.atlasdb.transaction.impl.TransactionConstants; +import java.nio.charset.StandardCharsets; +import java.util.concurrent.BrokenBarrierException; +import java.util.concurrent.CyclicBarrier; +import java.util.concurrent.ForkJoinPool; +import java.util.concurrent.TimeUnit; +import java.util.stream.IntStream; +import org.apache.cassandra.thrift.CfDef; +import org.apache.cassandra.thrift.KsDef; +import org.apache.thrift.TException; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; public class CassandraKeyValueServiceTableCreationIntegrationTest { private static final TableReference GOOD_TABLE = TableReference.createFromFullyQualifiedName("foo.bar"); diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTableManipulationIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTableManipulationIntegrationTest.java index 20e16fbe9b7..cce5576f56d 100644 --- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTableManipulationIntegrationTest.java +++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTableManipulationIntegrationTest.java @@ -16,19 +16,11 @@ package com.palantir.atlasdb.keyvalue.cassandra; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - import static com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceTestUtils.ORIGINAL_METADATA; import static com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceTestUtils.clearOutMetadataTable; import static com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceTestUtils.insertGenericMetadataIntoLegacyCell; - -import java.util.List; -import java.util.stream.Collectors; - -import org.junit.After; -import org.junit.ClassRule; -import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -38,6 +30,11 @@ import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.RetryLimitReachedException; import com.palantir.atlasdb.keyvalue.api.TableReference; +import java.util.List; +import java.util.stream.Collectors; +import org.junit.After; +import org.junit.ClassRule; +import org.junit.Test; public class CassandraKeyValueServiceTableManipulationIntegrationTest { private static final TableReference UPPER_UPPER = TableReference.createFromFullyQualifiedName("TEST.TABLE"); diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTransactionIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTransactionIntegrationTest.java index 3da3911aa7f..e66a5b7dc97 100644 --- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTransactionIntegrationTest.java +++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTransactionIntegrationTest.java @@ -15,20 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.function.Supplier; -import java.util.stream.Collectors; -import java.util.stream.LongStream; - -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestRule; - import com.google.common.base.Suppliers; import com.google.common.util.concurrent.Futures; import com.palantir.atlasdb.cassandra.CassandraMutationTimestampProviders; @@ -44,6 +30,18 @@ import com.palantir.flake.FlakeRetryingRule; import com.palantir.flake.ShouldRetry; import com.palantir.timestamp.TimestampManagementService; +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import java.util.stream.LongStream; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestRule; @ShouldRetry // The first test can fail with a TException: No host tried was able to create the keyspace requested. public class CassandraKeyValueServiceTransactionIntegrationTest extends AbstractTransactionTest { diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsSerializableTransactionTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsSerializableTransactionTest.java index 8d4d4de303c..4556251f05e 100644 --- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsSerializableTransactionTest.java +++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsSerializableTransactionTest.java @@ -17,14 +17,13 @@ import static org.mockito.Mockito.mock; -import org.junit.ClassRule; - import com.palantir.atlasdb.containers.CassandraResource; import com.palantir.atlasdb.sweep.metrics.TargetedSweepMetrics; import com.palantir.atlasdb.sweep.queue.MultiTableSweepQueueWriter; import com.palantir.atlasdb.sweep.queue.SweepQueue; import com.palantir.atlasdb.sweep.queue.TargetedSweeper; import com.palantir.atlasdb.transaction.impl.AbstractSerializableTransactionTest; +import org.junit.ClassRule; public class CassandraKvsSerializableTransactionTest extends AbstractSerializableTransactionTest { @ClassRule diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraSweepProgressStoreIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraSweepProgressStoreIntegrationTest.java index d0f4f3ed0b9..d037a82265d 100644 --- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraSweepProgressStoreIntegrationTest.java +++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraSweepProgressStoreIntegrationTest.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import org.junit.ClassRule; - import com.palantir.atlasdb.containers.CassandraResource; import com.palantir.atlasdb.sweep.progress.AbstractSweepProgressStoreTest; +import org.junit.ClassRule; public class CassandraSweepProgressStoreIntegrationTest extends AbstractSweepProgressStoreTest { @ClassRule diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTargetedSweepIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTargetedSweepIntegrationTest.java index 752f45a9e19..6d523f907dc 100644 --- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTargetedSweepIntegrationTest.java +++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTargetedSweepIntegrationTest.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import org.junit.ClassRule; - import com.palantir.atlasdb.containers.CassandraResource; import com.palantir.atlasdb.sweep.AbstractTargetedSweepTest; +import org.junit.ClassRule; public class CassandraTargetedSweepIntegrationTest extends AbstractTargetedSweepTest { @ClassRule diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTestTools.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTestTools.java index 35f6fda1b4b..4e692b39d86 100644 --- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTestTools.java +++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTestTools.java @@ -15,6 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.palantir.atlasdb.cassandra.CassandraMutationTimestampProvider; +import com.palantir.atlasdb.cassandra.CassandraMutationTimestampProviders; +import com.palantir.common.base.Throwables; +import com.palantir.timestamp.InMemoryTimestampService; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; @@ -25,11 +29,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import com.palantir.atlasdb.cassandra.CassandraMutationTimestampProvider; -import com.palantir.atlasdb.cassandra.CassandraMutationTimestampProviders; -import com.palantir.common.base.Throwables; -import com.palantir.timestamp.InMemoryTimestampService; - /** * Utilities for ETE tests * Created by aloro on 12/04/2016. diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBackupIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBackupIntegrationTest.java index b62e9aa25ee..4bb3f56d405 100644 --- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBackupIntegrationTest.java +++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBackupIntegrationTest.java @@ -18,12 +18,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import java.util.concurrent.ThreadLocalRandom; - -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; - import com.google.common.collect.ImmutableMap; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.containers.CassandraResource; @@ -31,6 +25,10 @@ import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.flake.ShouldRetry; import com.palantir.timestamp.TimestampBoundStore; +import java.util.concurrent.ThreadLocalRandom; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; @ShouldRetry public class CassandraTimestampBackupIntegrationTest { diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampIntegrationTest.java index a67a365898d..357d6018b65 100644 --- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampIntegrationTest.java +++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampIntegrationTest.java @@ -15,16 +15,15 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; - import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.containers.CassandraResource; import com.palantir.flake.ShouldRetry; import com.palantir.timestamp.MultipleRunningTimestampServiceError; import com.palantir.timestamp.TimestampBoundStore; +import org.junit.Assert; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; @ShouldRetry public class CassandraTimestampIntegrationTest { diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampStoreInvalidatorIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampStoreInvalidatorIntegrationTest.java index 396cb5ebb6e..a9a4021f0c7 100644 --- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampStoreInvalidatorIntegrationTest.java +++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampStoreInvalidatorIntegrationTest.java @@ -17,22 +17,20 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.google.common.collect.Iterables; +import com.palantir.atlasdb.AtlasDbConstants; +import com.palantir.atlasdb.containers.CassandraResource; +import com.palantir.flake.ShouldRetry; +import com.palantir.timestamp.MultipleRunningTimestampServiceError; +import com.palantir.timestamp.TimestampBoundStore; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicLong; - import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import com.google.common.collect.Iterables; -import com.palantir.atlasdb.AtlasDbConstants; -import com.palantir.atlasdb.containers.CassandraResource; -import com.palantir.flake.ShouldRetry; -import com.palantir.timestamp.MultipleRunningTimestampServiceError; -import com.palantir.timestamp.TimestampBoundStore; - @ShouldRetry public class CassandraTimestampStoreInvalidatorIntegrationTest { @ClassRule diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/AbstractDegradedClusterTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/AbstractDegradedClusterTest.java index d94eb63f562..f9e2a666b0c 100644 --- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/AbstractDegradedClusterTest.java +++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/AbstractDegradedClusterTest.java @@ -20,14 +20,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.fail; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import org.apache.thrift.TException; -import org.junit.Before; - import com.google.common.collect.Iterables; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.encoding.PtBytes; @@ -41,6 +33,12 @@ import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServices; import com.palantir.common.base.RunnableCheckedException; import com.palantir.common.exception.AtlasDbDependencyException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import org.apache.thrift.TException; +import org.junit.Before; public abstract class AbstractDegradedClusterTest { static final TableReference TEST_TABLE = TableReference.createWithEmptyNamespace("test_table"); diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/AbstractNodeAvailabilityTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/AbstractNodeAvailabilityTest.java index 46d93517949..ce345470af1 100644 --- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/AbstractNodeAvailabilityTest.java +++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/AbstractNodeAvailabilityTest.java @@ -17,10 +17,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.api.ClusterAvailabilityStatus; import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService; +import org.junit.Test; public abstract class AbstractNodeAvailabilityTest extends AbstractDegradedClusterTest { diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/CassandraMultiNodeMultiCasTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/CassandraMultiNodeMultiCasTest.java index d8bcadbbb3e..09810084612 100644 --- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/CassandraMultiNodeMultiCasTest.java +++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/CassandraMultiNodeMultiCasTest.java @@ -16,10 +16,9 @@ package com.palantir.cassandra.multinode; -import org.junit.ClassRule; - import com.palantir.atlasdb.containers.ThreeNodeCassandraResource; import com.palantir.atlasdb.keyvalue.impl.AbstractMultiCasTest; +import org.junit.ClassRule; public class CassandraMultiNodeMultiCasTest extends AbstractMultiCasTest { @ClassRule diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/CassandraSchemaLockTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/CassandraSchemaLockTest.java index d57c49bd75c..ed789ba47aa 100644 --- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/CassandraSchemaLockTest.java +++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/CassandraSchemaLockTest.java @@ -20,6 +20,16 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; +import com.google.common.base.Throwables; +import com.google.common.collect.ImmutableList; +import com.palantir.atlasdb.AtlasDbConstants; +import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; +import com.palantir.atlasdb.containers.Containers; +import com.palantir.atlasdb.containers.ThreeNodeCassandraCluster; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService; +import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceImpl; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -34,7 +44,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.Stream; - import org.hamcrest.Description; import org.hamcrest.FeatureMatcher; import org.hamcrest.Matcher; @@ -42,18 +51,6 @@ import org.junit.ClassRule; import org.junit.Test; -import com.google.common.base.Throwables; -import com.google.common.collect.ImmutableList; -import com.palantir.atlasdb.AtlasDbConstants; -import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; -import com.palantir.atlasdb.containers.Containers; -import com.palantir.atlasdb.containers.ThreeNodeCassandraCluster; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService; -import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceImpl; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - public class CassandraSchemaLockTest { private static final int THREAD_COUNT = 4; diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/NodesDownTestSetup.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/NodesDownTestSetup.java index 2daf9424107..a9bf48ff57f 100644 --- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/NodesDownTestSetup.java +++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/NodesDownTestSetup.java @@ -15,14 +15,6 @@ */ package com.palantir.cassandra.multinode; -import java.io.IOException; -import java.util.List; -import java.util.concurrent.TimeUnit; - -import org.awaitility.Awaitility; -import org.junit.AfterClass; -import org.junit.ClassRule; - import com.google.common.base.Throwables; import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; import com.palantir.atlasdb.cassandra.ImmutableCassandraKeyValueServiceConfig; @@ -31,6 +23,12 @@ import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService; import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceImpl; import com.palantir.docker.compose.connection.DockerPort; +import java.io.IOException; +import java.util.List; +import java.util.concurrent.TimeUnit; +import org.awaitility.Awaitility; +import org.junit.AfterClass; +import org.junit.ClassRule; public abstract class NodesDownTestSetup { private static final int CASSANDRA_THRIFT_PORT = 9160; diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownDeleteTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownDeleteTest.java index 68e5d886e75..9b5a86dae09 100644 --- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownDeleteTest.java +++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownDeleteTest.java @@ -15,13 +15,12 @@ */ package com.palantir.cassandra.multinode; -import org.junit.Test; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.TimestampRangeDelete; import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService; +import org.junit.Test; public class OneNodeDownDeleteTest extends AbstractDegradedClusterTest { diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownGetTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownGetTest.java index 1760d413ad7..b4872db7bf4 100644 --- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownGetTest.java +++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownGetTest.java @@ -18,11 +18,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import java.util.Map; -import java.util.Set; - -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -41,6 +36,9 @@ import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService; import com.palantir.common.base.ClosableIterator; import com.palantir.common.exception.AtlasDbDependencyException; +import java.util.Map; +import java.util.Set; +import org.junit.Test; public class OneNodeDownGetTest extends AbstractDegradedClusterTest { private static final Set> expectedRowEntries = ImmutableMap diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownMetadataTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownMetadataTest.java index 0a903aa4403..e5fb57f9ce2 100644 --- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownMetadataTest.java +++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownMetadataTest.java @@ -17,12 +17,11 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.google.common.collect.ImmutableMap; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService; +import org.junit.Test; public class OneNodeDownMetadataTest extends AbstractDegradedClusterTest { private static final TableReference TEST_TABLE_2 = TableReference.createWithEmptyNamespace("test_table_2"); diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownPutTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownPutTest.java index bf0d41e238d..b062849de8b 100644 --- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownPutTest.java +++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownPutTest.java @@ -18,10 +18,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import java.util.Map; - -import org.junit.Test; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; @@ -31,6 +27,8 @@ import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException; import com.palantir.atlasdb.keyvalue.api.Value; import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService; +import java.util.Map; +import org.junit.Test; public class OneNodeDownPutTest extends AbstractDegradedClusterTest { private static final Cell EMPTY_CELL = Cell.create(PtBytes.toBytes("empty"), FIRST_COLUMN); diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownTableManipulationTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownTableManipulationTest.java index 498b7d7326d..cde2d59a578 100644 --- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownTableManipulationTest.java +++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownTableManipulationTest.java @@ -17,13 +17,12 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService; +import org.junit.Test; public class OneNodeDownTableManipulationTest extends AbstractDegradedClusterTest { private static final TableReference TABLE_TO_DROP = TableReference.createWithEmptyNamespace("table_to_drop"); diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownTestSuite.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownTestSuite.java index 742fc643448..37665d98d3a 100644 --- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownTestSuite.java +++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownTestSuite.java @@ -15,15 +15,13 @@ */ package com.palantir.cassandra.multinode; +import com.google.common.collect.ImmutableList; +import com.palantir.atlasdb.containers.ThreeNodeCassandraCluster; import java.util.Arrays; - import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import com.google.common.collect.ImmutableList; -import com.palantir.atlasdb.containers.ThreeNodeCassandraCluster; - @RunWith(Suite.class) @Suite.SuiteClasses({ OneNodeDownGetTest.class, diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/ThreeNodesDownTestSuite.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/ThreeNodesDownTestSuite.java index 2a84f419dc2..ea9ab606ffd 100644 --- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/ThreeNodesDownTestSuite.java +++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/ThreeNodesDownTestSuite.java @@ -15,15 +15,13 @@ */ package com.palantir.cassandra.multinode; +import com.google.common.collect.ImmutableList; +import com.palantir.atlasdb.containers.ThreeNodeCassandraCluster; import java.util.Arrays; - import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import com.google.common.collect.ImmutableList; -import com.palantir.atlasdb.containers.ThreeNodeCassandraCluster; - @RunWith(Suite.class) @Suite.SuiteClasses(LessThanQuorumNodeAvailabilityTest.class) public final class ThreeNodesDownTestSuite extends NodesDownTestSetup { diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownGetTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownGetTest.java index 0d41fbac75f..e0ec709a734 100644 --- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownGetTest.java +++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownGetTest.java @@ -15,8 +15,6 @@ */ package com.palantir.cassandra.multinode; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.palantir.atlasdb.AtlasDbConstants; @@ -28,6 +26,7 @@ import com.palantir.atlasdb.keyvalue.api.Value; import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService; import com.palantir.common.base.ClosableIterator; +import org.junit.Test; public class TwoNodesDownGetTest extends AbstractDegradedClusterTest { diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownMetadataTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownMetadataTest.java index e486f7937b4..50583ffb57d 100644 --- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownMetadataTest.java +++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownMetadataTest.java @@ -16,11 +16,10 @@ package com.palantir.cassandra.multinode; -import org.junit.Test; - import com.google.common.collect.ImmutableMap; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService; +import org.junit.Test; public class TwoNodesDownMetadataTest extends AbstractDegradedClusterTest { diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownPutTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownPutTest.java index 3b04c930eb4..47780e7d75b 100644 --- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownPutTest.java +++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownPutTest.java @@ -15,10 +15,6 @@ */ package com.palantir.cassandra.multinode; -import java.util.Map; - -import org.junit.Test; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; @@ -26,6 +22,8 @@ import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService; +import java.util.Map; +import org.junit.Test; public class TwoNodesDownPutTest extends AbstractDegradedClusterTest { private static final Cell EMPTY_CELL = Cell.create(PtBytes.toBytes("empty"), FIRST_COLUMN); diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownTableManipulationTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownTableManipulationTest.java index 8edc52cee4d..fddbe169fed 100644 --- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownTableManipulationTest.java +++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownTableManipulationTest.java @@ -15,11 +15,10 @@ */ package com.palantir.cassandra.multinode; -import org.junit.Test; - import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService; +import org.junit.Test; public class TwoNodesDownTableManipulationTest extends AbstractDegradedClusterTest { diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownTestSuite.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownTestSuite.java index 357f4b3b2b1..53afd1e4232 100644 --- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownTestSuite.java +++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownTestSuite.java @@ -15,15 +15,13 @@ */ package com.palantir.cassandra.multinode; +import com.google.common.collect.ImmutableList; +import com.palantir.atlasdb.containers.ThreeNodeCassandraCluster; import java.util.Arrays; - import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import com.google.common.collect.ImmutableList; -import com.palantir.atlasdb.containers.ThreeNodeCassandraCluster; - @RunWith(Suite.class) @Suite.SuiteClasses({ LessThanQuorumNodeAvailabilityTest.class, diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactory.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactory.java index 9cc7de885ed..9d9f0de0c07 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactory.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactory.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.cassandra; -import java.util.Optional; -import java.util.function.LongSupplier; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.auto.service.AutoService; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; @@ -42,6 +35,11 @@ import com.palantir.timestamp.PersistentTimestampServiceImpl; import com.palantir.timestamp.TimestampStoreInvalidator; import com.palantir.util.OptionalResolver; +import java.util.Optional; +import java.util.function.LongSupplier; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @AutoService(AtlasDbFactory.class) public class CassandraAtlasDbFactory implements AtlasDbFactory { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCellLoadingConfig.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCellLoadingConfig.java index d7adacb574c..a61b10f6fc3 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCellLoadingConfig.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCellLoadingConfig.java @@ -16,12 +16,11 @@ package com.palantir.atlasdb.cassandra; -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.google.common.base.Preconditions; import com.palantir.atlasdb.keyvalue.cassandra.CassandraConstants; +import org.immutables.value.Value; /** * Specifies limits on query sizes when loading cells from an underlying Cassandra key-value service. diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCredentialsConfig.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCredentialsConfig.java index 4c4be8eca49..f8b6115109b 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCredentialsConfig.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCredentialsConfig.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.cassandra; -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.immutables.value.Value; @JsonDeserialize(as = ImmutableCassandraCredentialsConfig.class) @JsonSerialize(as = ImmutableCassandraCredentialsConfig.class) diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraJmxCompactionConfig.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraJmxCompactionConfig.java index d0973d203cd..ab0b730ea3d 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraJmxCompactionConfig.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraJmxCompactionConfig.java @@ -15,14 +15,12 @@ */ package com.palantir.atlasdb.cassandra; -import javax.annotation.Nullable; - -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.google.common.base.Strings; import com.palantir.logsafe.Preconditions; +import javax.annotation.Nullable; +import org.immutables.value.Value; @JsonDeserialize(as = ImmutableCassandraJmxCompactionConfig.class) @JsonSerialize(as = ImmutableCassandraJmxCompactionConfig.class) diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfig.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfig.java index 9c3f463c472..1b58ae7b2e0 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfig.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfig.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.cassandra; -import java.net.InetSocketAddress; -import java.net.SocketTimeoutException; -import java.util.Map; -import java.util.Optional; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -35,6 +28,11 @@ import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.exceptions.SafeIllegalStateException; import com.palantir.processors.AutoDelegate; +import java.net.InetSocketAddress; +import java.net.SocketTimeoutException; +import java.util.Map; +import java.util.Optional; +import org.immutables.value.Value; @AutoService(KeyValueServiceConfig.class) @JsonDeserialize(as = ImmutableCassandraKeyValueServiceConfig.class) diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceRuntimeConfig.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceRuntimeConfig.java index c295159adfc..c07567a822c 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceRuntimeConfig.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceRuntimeConfig.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.cassandra; -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -24,6 +22,7 @@ import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.cassandra.CassandraConstants; import com.palantir.atlasdb.spi.KeyValueServiceRuntimeConfig; +import org.immutables.value.Value; @AutoService(KeyValueServiceRuntimeConfig.class) @JsonDeserialize(as = ImmutableCassandraKeyValueServiceRuntimeConfig.class) diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraReloadableKvsConfig.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraReloadableKvsConfig.java index b6c0585a182..ab567ff7f6e 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraReloadableKvsConfig.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraReloadableKvsConfig.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.cassandra; +import com.google.common.base.MoreObjects; +import com.palantir.atlasdb.spi.KeyValueServiceRuntimeConfig; import java.util.Optional; import java.util.function.Function; import java.util.function.Supplier; -import com.google.common.base.MoreObjects; -import com.palantir.atlasdb.spi.KeyValueServiceRuntimeConfig; - public class CassandraReloadableKvsConfig implements AutoDelegate_CassandraKeyValueServiceConfig { private final CassandraKeyValueServiceConfig config; private final Supplier> runtimeConfigSupplier; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraServersConfigs.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraServersConfigs.java index 84a114ce974..2cfae5025b3 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraServersConfigs.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraServersConfigs.java @@ -17,14 +17,6 @@ package com.palantir.atlasdb.cassandra; -import java.net.InetSocketAddress; -import java.util.Optional; -import java.util.Set; -import java.util.function.BiFunction; -import java.util.stream.Collectors; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -33,6 +25,12 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.SafeArg; +import java.net.InetSocketAddress; +import java.util.Optional; +import java.util.Set; +import java.util.function.BiFunction; +import java.util.stream.Collectors; +import org.immutables.value.Value; public final class CassandraServersConfigs { private CassandraServersConfigs() { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/Blacklist.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/Blacklist.java index 5bd73036419..e08eed3d8ec 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/Blacklist.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/Blacklist.java @@ -15,6 +15,12 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; +import com.palantir.logsafe.SafeArg; +import com.palantir.logsafe.UnsafeArg; import java.net.InetSocketAddress; import java.util.Collection; import java.util.List; @@ -22,17 +28,9 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; -import com.palantir.logsafe.SafeArg; -import com.palantir.logsafe.UnsafeArg; - public class Blacklist { private static final Logger log = LoggerFactory.getLogger(CassandraClientPool.class); diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraApiVersion.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraApiVersion.java index 98bf8a2d47a..dca58e4fdaa 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraApiVersion.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraApiVersion.java @@ -15,13 +15,11 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.palantir.logsafe.SafeArg; import java.util.Arrays; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.palantir.logsafe.SafeArg; - public class CassandraApiVersion { private static final Logger LOGGER = LoggerFactory.getLogger(CassandraApiVersion.class); diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClient.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClient.java index d4dce2eb07a..f93de850eba 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClient.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClient.java @@ -15,11 +15,12 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.processors.AutoDelegate; import java.io.Closeable; import java.nio.ByteBuffer; import java.util.List; import java.util.Map; - import org.apache.cassandra.thrift.CASResult; import org.apache.cassandra.thrift.CfDef; import org.apache.cassandra.thrift.Column; @@ -43,9 +44,6 @@ import org.apache.thrift.TException; import org.apache.thrift.protocol.TProtocol; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.processors.AutoDelegate; - @SuppressWarnings({"all"}) // thrift variable names. @AutoDelegate public interface CassandraClient extends Closeable { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientFactory.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientFactory.java index 7ee00c7aa23..e64c31d63ed 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientFactory.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientFactory.java @@ -15,16 +15,23 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.google.common.collect.Maps; +import com.palantir.atlasdb.cassandra.CassandraCredentialsConfig; +import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; +import com.palantir.atlasdb.util.AtlasDbMetrics; +import com.palantir.atlasdb.util.MetricsManager; +import com.palantir.common.exception.AtlasDbDependencyException; +import com.palantir.conjure.java.config.ssl.SslSocketFactories; +import com.palantir.logsafe.SafeArg; +import com.palantir.logsafe.UnsafeArg; import java.io.IOException; import java.net.InetSocketAddress; import java.net.SocketException; import java.security.NoSuchAlgorithmException; import java.util.Map; - import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; - import org.apache.cassandra.thrift.AuthenticationRequest; import org.apache.cassandra.thrift.Cassandra; import org.apache.cassandra.thrift.Cassandra.Client; @@ -41,16 +48,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.Maps; -import com.palantir.atlasdb.cassandra.CassandraCredentialsConfig; -import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; -import com.palantir.atlasdb.util.AtlasDbMetrics; -import com.palantir.atlasdb.util.MetricsManager; -import com.palantir.common.exception.AtlasDbDependencyException; -import com.palantir.conjure.java.config.ssl.SslSocketFactories; -import com.palantir.logsafe.SafeArg; -import com.palantir.logsafe.UnsafeArg; - public class CassandraClientFactory extends BasePooledObjectFactory { private static final Logger log = LoggerFactory.getLogger(CassandraClientFactory.class); diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientImpl.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientImpl.java index 2e0a2377c0d..b0de898e11f 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientImpl.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientImpl.java @@ -15,6 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.google.common.collect.ImmutableSet; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.keyvalue.impl.AbstractKeyValueService; +import com.palantir.logsafe.exceptions.SafeIllegalStateException; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.List; @@ -23,7 +27,6 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; - import org.apache.cassandra.thrift.CASResult; import org.apache.cassandra.thrift.Cassandra; import org.apache.cassandra.thrift.CfDef; @@ -53,11 +56,6 @@ import org.apache.thrift.transport.TTransport; import org.apache.thrift.transport.TTransportException; -import com.google.common.collect.ImmutableSet; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.atlasdb.keyvalue.impl.AbstractKeyValueService; -import com.palantir.logsafe.exceptions.SafeIllegalStateException; - @SuppressWarnings({"all"}) // thrift variable names. public class CassandraClientImpl implements CassandraClient { private final Cassandra.Client client; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPool.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPool.java index b75c7c18362..50502a48462 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPool.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPool.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.net.InetSocketAddress; -import java.util.Map; - import com.palantir.common.base.FunctionCheckedException; import com.palantir.processors.AutoDelegate; +import java.net.InetSocketAddress; +import java.util.Map; @AutoDelegate public interface CassandraClientPool { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolImpl.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolImpl.java index f870cae7f3e..a0559898067 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolImpl.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolImpl.java @@ -15,21 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.net.InetSocketAddress; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; - -import org.apache.cassandra.thrift.NotFoundException; -import org.apache.cassandra.thrift.TokenRange; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; @@ -52,6 +37,19 @@ import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.net.InetSocketAddress; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; +import org.apache.cassandra.thrift.NotFoundException; +import org.apache.cassandra.thrift.TokenRange; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Feature breakdown: diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolingContainer.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolingContainer.java index e9b32e619a8..a988aea1a5c 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolingContainer.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolingContainer.java @@ -15,6 +15,17 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.codahale.metrics.Gauge; +import com.google.common.base.Function; +import com.google.common.base.MoreObjects; +import com.google.common.collect.ImmutableMap; +import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; +import com.palantir.atlasdb.encoding.PtBytes; +import com.palantir.atlasdb.util.MetricsManager; +import com.palantir.common.base.FunctionCheckedException; +import com.palantir.common.pooling.PoolingContainer; +import com.palantir.logsafe.SafeArg; +import com.palantir.logsafe.UnsafeArg; import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; import java.lang.management.ThreadMXBean; @@ -27,7 +38,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; - import org.apache.commons.pool2.impl.GenericObjectPool; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; import org.apache.thrift.transport.TFramedTransport; @@ -37,18 +47,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Gauge; -import com.google.common.base.Function; -import com.google.common.base.MoreObjects; -import com.google.common.collect.ImmutableMap; -import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; -import com.palantir.atlasdb.encoding.PtBytes; -import com.palantir.atlasdb.util.MetricsManager; -import com.palantir.common.base.FunctionCheckedException; -import com.palantir.common.pooling.PoolingContainer; -import com.palantir.logsafe.SafeArg; -import com.palantir.logsafe.UnsafeArg; - public class CassandraClientPoolingContainer implements PoolingContainer { private static final Logger log = LoggerFactory.getLogger(CassandraClientPoolingContainer.class); diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConstants.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConstants.java index 1e449579986..6f5a6d00938 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConstants.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConstants.java @@ -15,9 +15,8 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.util.Set; - import com.google.common.collect.ImmutableSet; +import java.util.Set; public final class CassandraConstants { static final String DEFAULT_COMPRESSION_TYPE = "LZ4Compressor"; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueService.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueService.java index a63cdd3f731..f3a66685fea 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueService.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueService.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.util.List; - import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.processors.AutoDelegate; +import java.util.List; @AutoDelegate public interface CassandraKeyValueService extends KeyValueService { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceImpl.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceImpl.java index 52dc604b2e5..220939090f0 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceImpl.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceImpl.java @@ -15,38 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.net.InetSocketAddress; -import java.nio.ByteBuffer; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Optional; -import java.util.Set; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.function.Supplier; -import java.util.stream.Collectors; -import java.util.stream.StreamSupport; - -import javax.annotation.Nullable; - -import org.apache.cassandra.thrift.CASResult; -import org.apache.cassandra.thrift.CfDef; -import org.apache.cassandra.thrift.Column; -import org.apache.cassandra.thrift.ColumnOrSuperColumn; -import org.apache.cassandra.thrift.ConsistencyLevel; -import org.apache.cassandra.thrift.Deletion; -import org.apache.cassandra.thrift.KsDef; -import org.apache.cassandra.thrift.Mutation; -import org.apache.cassandra.thrift.SlicePredicate; -import org.apache.thrift.TException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.codahale.metrics.InstrumentedExecutorService; import com.codahale.metrics.MetricRegistry; import com.google.common.annotations.VisibleForTesting; @@ -130,8 +98,36 @@ import com.palantir.util.paging.AbstractPagingIterable; import com.palantir.util.paging.SimpleTokenBackedResultsPage; import com.palantir.util.paging.TokenBackedBasicResultsPage; - +import java.net.InetSocketAddress; +import java.nio.ByteBuffer; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; +import javax.annotation.Nullable; import okio.ByteString; +import org.apache.cassandra.thrift.CASResult; +import org.apache.cassandra.thrift.CfDef; +import org.apache.cassandra.thrift.Column; +import org.apache.cassandra.thrift.ColumnOrSuperColumn; +import org.apache.cassandra.thrift.ConsistencyLevel; +import org.apache.cassandra.thrift.Deletion; +import org.apache.cassandra.thrift.KsDef; +import org.apache.cassandra.thrift.Mutation; +import org.apache.cassandra.thrift.SlicePredicate; +import org.apache.thrift.TException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Each service can have one or many C* KVS. diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServices.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServices.java index a795b9a4b50..bce6a2d3218 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServices.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServices.java @@ -15,25 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.net.InetSocketAddress; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; -import java.util.stream.Collectors; - -import org.apache.cassandra.thrift.CfDef; -import org.apache.cassandra.thrift.Column; -import org.apache.cassandra.thrift.ColumnOrSuperColumn; -import org.apache.thrift.TException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Preconditions; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableSet; @@ -55,6 +36,23 @@ import com.palantir.common.base.Throwables; import com.palantir.common.visitor.Visitor; import com.palantir.util.Pair; +import java.net.InetSocketAddress; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.UUID; +import java.util.stream.Collectors; +import org.apache.cassandra.thrift.CfDef; +import org.apache.cassandra.thrift.Column; +import org.apache.cassandra.thrift.ColumnOrSuperColumn; +import org.apache.thrift.TException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class CassandraKeyValueServices { private static final Logger log = LoggerFactory.getLogger(CassandraKeyValueService.class); // did this on purpose diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraLogHelper.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraLogHelper.java index f5ed4d73630..7955d623bf9 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraLogHelper.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraLogHelper.java @@ -15,18 +15,16 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.google.common.collect.Multimap; +import com.google.common.collect.Range; +import com.google.common.collect.RangeMap; import java.net.InetSocketAddress; import java.util.Collection; import java.util.List; import java.util.Set; import java.util.stream.Collectors; - import org.apache.cassandra.thrift.TokenRange; -import com.google.common.collect.Multimap; -import com.google.common.collect.Range; -import com.google.common.collect.RangeMap; - public final class CassandraLogHelper { private CassandraLogHelper() { // Utility class. diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraRequestExceptionHandler.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraRequestExceptionHandler.java index e00b7591ecc..5cefbda222c 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraRequestExceptionHandler.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraRequestExceptionHandler.java @@ -15,6 +15,11 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.google.common.annotations.VisibleForTesting; +import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException; +import com.palantir.common.exception.AtlasDbDependencyException; +import com.palantir.logsafe.SafeArg; +import com.palantir.logsafe.UnsafeArg; import java.net.InetSocketAddress; import java.net.SocketTimeoutException; import java.time.Duration; @@ -22,7 +27,6 @@ import java.util.Optional; import java.util.concurrent.ThreadLocalRandom; import java.util.function.Supplier; - import org.apache.cassandra.thrift.InvalidRequestException; import org.apache.cassandra.thrift.TimedOutException; import org.apache.cassandra.thrift.UnavailableException; @@ -30,12 +34,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.annotations.VisibleForTesting; -import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException; -import com.palantir.common.exception.AtlasDbDependencyException; -import com.palantir.logsafe.SafeArg; -import com.palantir.logsafe.UnsafeArg; - class CassandraRequestExceptionHandler { private static final Logger log = LoggerFactory.getLogger(CassandraRequestExceptionHandler.class); diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableCreator.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableCreator.java index ab9ad35f4b6..c102f1c117d 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableCreator.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableCreator.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.util.Map; -import java.util.UUID; - -import org.apache.cassandra.thrift.Compression; -import org.apache.thrift.TException; - import com.datastax.driver.core.DataType; import com.datastax.driver.core.schemabuilder.SchemaBuilder; import com.datastax.driver.core.schemabuilder.TableOptions.CompactionOptions; @@ -32,6 +26,10 @@ import com.palantir.atlasdb.table.description.TableMetadata; import com.palantir.common.base.Throwables; import com.palantir.logsafe.SafeArg; +import java.util.Map; +import java.util.UUID; +import org.apache.cassandra.thrift.Compression; +import org.apache.thrift.TException; class CassandraTableCreator { private static final String ROW = "key"; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableDropper.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableDropper.java index 7621bf56677..2b0e1e953e4 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableDropper.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableDropper.java @@ -15,20 +15,18 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.util.Set; -import java.util.stream.Collectors; - -import org.apache.cassandra.thrift.KsDef; -import org.apache.thrift.TException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.logging.LoggingArgs; import com.palantir.common.base.Throwables; +import java.util.Set; +import java.util.stream.Collectors; +import org.apache.cassandra.thrift.KsDef; +import org.apache.thrift.TException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class CassandraTableDropper { private static final Logger log = LoggerFactory.getLogger(CassandraTableDropper.class); diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableMetadata.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableMetadata.java index ede76082af0..5fde9060f4f 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableMetadata.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableMetadata.java @@ -16,14 +16,6 @@ package com.palantir.atlasdb.keyvalue.cassandra; -import java.util.Arrays; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; @@ -38,6 +30,12 @@ import com.palantir.common.base.ClosableIterator; import com.palantir.common.base.Throwables; import com.palantir.common.exception.AtlasDbDependencyException; +import java.util.Arrays; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class CassandraTableMetadata { private static final Logger log = LoggerFactory.getLogger(CassandraTableMetadata.class); diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableTruncator.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableTruncator.java index 688608c4a53..2a724a261df 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableTruncator.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableTruncator.java @@ -16,13 +16,11 @@ package com.palantir.atlasdb.keyvalue.cassandra; -import java.util.Collection; - -import org.apache.thrift.TException; - import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.common.base.FunctionCheckedException; import com.palantir.common.base.Throwables; +import java.util.Collection; +import org.apache.thrift.TException; class CassandraTableTruncator { private final TracingQueryRunner queryRunner; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTables.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTables.java index 36d2544d11e..c6841bf3edf 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTables.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTables.java @@ -15,21 +15,19 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; +import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.common.base.FunctionCheckedException; +import com.palantir.common.base.Throwables; import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; - import org.apache.cassandra.thrift.CfDef; import org.apache.cassandra.thrift.KsDef; import org.apache.thrift.TException; -import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; -import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.common.base.FunctionCheckedException; -import com.palantir.common.base.Throwables; - class CassandraTables { private final CassandraClientPool clientPool; private final CassandraKeyValueServiceConfig config; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBackupRunner.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBackupRunner.java index 12dca328bae..af372282404 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBackupRunner.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBackupRunner.java @@ -15,18 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.util.Map; - -import javax.annotation.Nullable; - -import org.apache.cassandra.thrift.Compression; -import org.apache.cassandra.thrift.ConsistencyLevel; -import org.apache.cassandra.thrift.CqlResult; -import org.apache.thrift.TException; -import org.immutables.value.Value; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableMap; import com.palantir.atlasdb.AtlasDbConstants; @@ -36,6 +24,15 @@ import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.SafeArg; import com.palantir.util.Pair; +import java.util.Map; +import javax.annotation.Nullable; +import org.apache.cassandra.thrift.Compression; +import org.apache.cassandra.thrift.ConsistencyLevel; +import org.apache.cassandra.thrift.CqlResult; +import org.apache.thrift.TException; +import org.immutables.value.Value; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class CassandraTimestampBackupRunner { private static final Logger log = LoggerFactory.getLogger(CassandraTimestampBackupRunner.class); diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBoundStore.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBoundStore.java index 1ae078c230b..7277a216970 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBoundStore.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBoundStore.java @@ -15,19 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.nio.ByteBuffer; -import java.util.stream.Collectors; - -import javax.annotation.concurrent.GuardedBy; - -import org.apache.cassandra.thrift.CASResult; -import org.apache.cassandra.thrift.Column; -import org.apache.cassandra.thrift.ColumnOrSuperColumn; -import org.apache.cassandra.thrift.ConsistencyLevel; -import org.apache.cassandra.thrift.NotFoundException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.ImmutableList; import com.palantir.async.initializer.AsyncInitializer; import com.palantir.atlasdb.AtlasDbConstants; @@ -43,6 +30,16 @@ import com.palantir.timestamp.MultipleRunningTimestampServiceError; import com.palantir.timestamp.TimestampBoundStore; import com.palantir.util.debug.ThreadDumps; +import java.nio.ByteBuffer; +import java.util.stream.Collectors; +import javax.annotation.concurrent.GuardedBy; +import org.apache.cassandra.thrift.CASResult; +import org.apache.cassandra.thrift.Column; +import org.apache.cassandra.thrift.ColumnOrSuperColumn; +import org.apache.cassandra.thrift.ConsistencyLevel; +import org.apache.cassandra.thrift.NotFoundException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class CassandraTimestampBoundStore implements TimestampBoundStore { private class InitializingWrapper extends AsyncInitializer implements AutoDelegate_TimestampBoundStore { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampUtils.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampUtils.java index 56c7f1645cf..57d59cb08ea 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampUtils.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampUtils.java @@ -15,14 +15,22 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.Iterables; +import com.google.common.io.BaseEncoding; +import com.google.protobuf.ByteString; +import com.palantir.atlasdb.AtlasDbConstants; +import com.palantir.atlasdb.encoding.PtBytes; +import com.palantir.atlasdb.logging.LoggingArgs; +import com.palantir.logsafe.Preconditions; +import com.palantir.logsafe.SafeArg; +import com.palantir.util.Pair; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; - import javax.annotation.Nullable; - import org.apache.cassandra.thrift.Column; import org.apache.cassandra.thrift.CqlResult; import org.apache.cassandra.thrift.CqlRow; @@ -30,17 +38,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.Iterables; -import com.google.common.io.BaseEncoding; -import com.google.protobuf.ByteString; -import com.palantir.atlasdb.AtlasDbConstants; -import com.palantir.atlasdb.encoding.PtBytes; -import com.palantir.atlasdb.logging.LoggingArgs; -import com.palantir.logsafe.Preconditions; -import com.palantir.logsafe.SafeArg; -import com.palantir.util.Pair; - public final class CassandraTimestampUtils { private static final Logger log = LoggerFactory.getLogger(CassandraTimestampUtils.class); diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraUtils.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraUtils.java index c4de7ce8751..9d553ffc1ea 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraUtils.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraUtils.java @@ -15,16 +15,14 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.util.List; - -import org.apache.cassandra.thrift.TokenRange; -import org.apache.cassandra.thrift.UnavailableException; - import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException; import com.palantir.atlasdb.keyvalue.api.RetryLimitReachedException; import com.palantir.common.base.FunctionCheckedException; import com.palantir.common.exception.AtlasDbDependencyException; +import java.util.List; +import org.apache.cassandra.thrift.TokenRange; +import org.apache.cassandra.thrift.UnavailableException; public final class CassandraUtils { private CassandraUtils() {} diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifier.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifier.java index be5e2f61b83..75c3bf5e824 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifier.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifier.java @@ -15,21 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.net.InetSocketAddress; -import java.util.Map; -import java.util.Objects; -import java.util.Set; - -import org.apache.cassandra.thrift.EndpointDetails; -import org.apache.cassandra.thrift.InvalidRequestException; -import org.apache.cassandra.thrift.KsDef; -import org.apache.cassandra.thrift.NotFoundException; -import org.apache.cassandra.thrift.TokenRange; -import org.apache.commons.lang3.Validate; -import org.apache.thrift.TException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Verify; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; @@ -44,6 +29,19 @@ import com.palantir.common.base.FunctionCheckedException; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; +import java.net.InetSocketAddress; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import org.apache.cassandra.thrift.EndpointDetails; +import org.apache.cassandra.thrift.InvalidRequestException; +import org.apache.cassandra.thrift.KsDef; +import org.apache.cassandra.thrift.NotFoundException; +import org.apache.cassandra.thrift.TokenRange; +import org.apache.commons.lang3.Validate; +import org.apache.thrift.TException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class CassandraVerifier { private static final Logger log = LoggerFactory.getLogger(CassandraVerifier.class); diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellDeleter.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellDeleter.java index 8bf492ffad5..aef885cca4f 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellDeleter.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellDeleter.java @@ -15,18 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.net.InetSocketAddress; -import java.nio.ByteBuffer; -import java.util.Collection; -import java.util.Collections; -import java.util.Map; -import java.util.function.LongUnaryOperator; - -import org.apache.cassandra.thrift.ConsistencyLevel; -import org.apache.cassandra.thrift.Deletion; -import org.apache.cassandra.thrift.Mutation; -import org.apache.cassandra.thrift.SlicePredicate; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; @@ -37,6 +25,16 @@ import com.palantir.atlasdb.keyvalue.cassandra.thrift.MutationMap; import com.palantir.common.base.FunctionCheckedException; import com.palantir.common.base.Throwables; +import java.net.InetSocketAddress; +import java.nio.ByteBuffer; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import java.util.function.LongUnaryOperator; +import org.apache.cassandra.thrift.ConsistencyLevel; +import org.apache.cassandra.thrift.Deletion; +import org.apache.cassandra.thrift.Mutation; +import org.apache.cassandra.thrift.SlicePredicate; class CellDeleter { private final CassandraClientPool clientPool; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoader.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoader.java index 6d305adab21..2366cf61929 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoader.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoader.java @@ -15,6 +15,20 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Multimap; +import com.google.common.primitives.UnsignedBytes; +import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceRuntimeConfig; +import com.palantir.atlasdb.keyvalue.api.Cell; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.keyvalue.cassandra.thrift.SlicePredicates; +import com.palantir.atlasdb.logging.LoggingArgs; +import com.palantir.atlasdb.util.AnnotatedCallable; +import com.palantir.atlasdb.util.AnnotationType; +import com.palantir.common.base.FunctionCheckedException; +import com.palantir.logsafe.SafeArg; import java.net.InetSocketAddress; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -24,7 +38,6 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.function.Supplier; - import org.apache.cassandra.thrift.ColumnOrSuperColumn; import org.apache.cassandra.thrift.ColumnParent; import org.apache.cassandra.thrift.ConsistencyLevel; @@ -33,21 +46,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Multimap; -import com.google.common.primitives.UnsignedBytes; -import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceRuntimeConfig; -import com.palantir.atlasdb.keyvalue.api.Cell; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.atlasdb.keyvalue.cassandra.thrift.SlicePredicates; -import com.palantir.atlasdb.logging.LoggingArgs; -import com.palantir.atlasdb.util.AnnotatedCallable; -import com.palantir.atlasdb.util.AnnotationType; -import com.palantir.common.base.FunctionCheckedException; -import com.palantir.logsafe.SafeArg; - final class CellLoader { private static final Logger log = LoggerFactory.getLogger(CellLoader.class); diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoadingBatcher.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoadingBatcher.java index 022fa8df5cf..37978ed46ef 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoadingBatcher.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoadingBatcher.java @@ -16,12 +16,6 @@ package com.palantir.atlasdb.keyvalue.cassandra; -import java.net.InetSocketAddress; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.function.Supplier; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; @@ -31,6 +25,11 @@ import com.palantir.atlasdb.cassandra.CassandraCellLoadingConfig; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.TableReference; +import java.net.InetSocketAddress; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.function.Supplier; /** * Divides a list of {@link Cell}s into batches for querying. diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellRangeDeleter.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellRangeDeleter.java index 0bfe361a6b6..0c53cf16d82 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellRangeDeleter.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellRangeDeleter.java @@ -16,15 +16,6 @@ package com.palantir.atlasdb.keyvalue.cassandra; -import java.net.InetSocketAddress; -import java.util.Map; -import java.util.function.LongUnaryOperator; -import java.util.function.ToLongFunction; - -import org.apache.cassandra.thrift.ConsistencyLevel; -import org.apache.cassandra.thrift.Mutation; -import org.apache.thrift.TException; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import com.palantir.atlasdb.keyvalue.api.Cell; @@ -35,6 +26,13 @@ import com.palantir.atlasdb.keyvalue.cassandra.thrift.Mutations; import com.palantir.common.base.FunctionCheckedException; import com.palantir.common.base.Throwables; +import java.net.InetSocketAddress; +import java.util.Map; +import java.util.function.LongUnaryOperator; +import java.util.function.ToLongFunction; +import org.apache.cassandra.thrift.ConsistencyLevel; +import org.apache.cassandra.thrift.Mutation; +import org.apache.thrift.TException; class CellRangeDeleter { private final CassandraClientPool clientPool; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellValuePutter.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellValuePutter.java index 685a29b6508..965de3204a1 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellValuePutter.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellValuePutter.java @@ -15,16 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.net.InetSocketAddress; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Callable; -import java.util.function.LongSupplier; - -import org.apache.cassandra.thrift.Column; -import org.apache.cassandra.thrift.ColumnOrSuperColumn; -import org.apache.cassandra.thrift.Mutation; - import com.google.common.base.Function; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; @@ -39,6 +29,14 @@ import com.palantir.atlasdb.util.AnnotatedCallable; import com.palantir.atlasdb.util.AnnotationType; import com.palantir.common.base.FunctionCheckedException; +import java.net.InetSocketAddress; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Callable; +import java.util.function.LongSupplier; +import org.apache.cassandra.thrift.Column; +import org.apache.cassandra.thrift.ColumnOrSuperColumn; +import org.apache.cassandra.thrift.Mutation; public class CellValuePutter { private static final Function, Long> ENTRY_SIZING_FUNCTION = input -> diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ColumnFamilyDefinitions.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ColumnFamilyDefinitions.java index 7820d561d77..8add3a62236 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ColumnFamilyDefinitions.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ColumnFamilyDefinitions.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.util.Map; -import java.util.Optional; - -import org.apache.cassandra.thrift.CfDef; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -34,6 +27,11 @@ import com.palantir.atlasdb.table.description.TableMetadata; import com.palantir.common.exception.PalantirRuntimeException; import com.palantir.logsafe.SafeArg; +import java.util.Map; +import java.util.Optional; +import org.apache.cassandra.thrift.CfDef; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; final class ColumnFamilyDefinitions { private static final Logger log = LoggerFactory.getLogger(CassandraKeyValueService.class); // did this on purpose diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutor.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutor.java index 6ce2236ab1f..002297f1c7b 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutor.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutor.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.util.List; -import java.util.concurrent.ExecutorService; - import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.cassandra.sweep.CellWithTimestamp; +import java.util.List; +import java.util.concurrent.ExecutorService; public interface CqlExecutor { /** diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutorImpl.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutorImpl.java index c3ad0aa31a3..5f2bdeb0e4e 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutorImpl.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutorImpl.java @@ -15,6 +15,22 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.palantir.atlasdb.encoding.PtBytes; +import com.palantir.atlasdb.keyvalue.api.Cell; +import com.palantir.atlasdb.keyvalue.api.RetryLimitReachedException; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.keyvalue.cassandra.sweep.CellWithTimestamp; +import com.palantir.atlasdb.logging.LoggingArgs; +import com.palantir.common.annotation.Output; +import com.palantir.common.base.FunctionCheckedException; +import com.palantir.common.base.Throwables; +import com.palantir.logsafe.Arg; +import com.palantir.logsafe.SafeArg; +import com.palantir.logsafe.UnsafeArg; import java.net.InetSocketAddress; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; @@ -30,7 +46,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; import java.util.stream.Collectors; - import org.apache.cassandra.thrift.Compression; import org.apache.cassandra.thrift.ConsistencyLevel; import org.apache.cassandra.thrift.CqlPreparedResult; @@ -40,23 +55,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.palantir.atlasdb.encoding.PtBytes; -import com.palantir.atlasdb.keyvalue.api.Cell; -import com.palantir.atlasdb.keyvalue.api.RetryLimitReachedException; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.atlasdb.keyvalue.cassandra.sweep.CellWithTimestamp; -import com.palantir.atlasdb.logging.LoggingArgs; -import com.palantir.common.annotation.Output; -import com.palantir.common.base.FunctionCheckedException; -import com.palantir.common.base.Throwables; -import com.palantir.logsafe.Arg; -import com.palantir.logsafe.SafeArg; -import com.palantir.logsafe.UnsafeArg; - public class CqlExecutorImpl implements CqlExecutor { private final QueryExecutor queryExecutor; private Logger log = LoggerFactory.getLogger(CqlExecutor.class); diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlQuery.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlQuery.java index 2cb2708334f..014ed14d62e 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlQuery.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlQuery.java @@ -15,17 +15,15 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.util.List; -import java.util.stream.Collectors; - -import org.immutables.value.Value; - import com.google.common.base.Stopwatch; import com.palantir.atlasdb.logging.KvsProfilingLogger; import com.palantir.atlasdb.logging.LoggingArgs; import com.palantir.logsafe.Arg; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; +import java.util.List; +import java.util.stream.Collectors; +import org.immutables.value.Value; @Value.Immutable public abstract class CqlQuery { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlSinglePartitionBatchQuery.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlSinglePartitionBatchQuery.java index 2951552ed32..3e9b1d165f6 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlSinglePartitionBatchQuery.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlSinglePartitionBatchQuery.java @@ -15,12 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.util.List; - -import org.immutables.value.Value; - import com.google.common.collect.Lists; import com.palantir.logsafe.Arg; +import java.util.List; +import org.immutables.value.Value; @Value.Immutable public abstract class CqlSinglePartitionBatchQuery { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTables.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTables.java index ec1b3f6d522..fe310127d67 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTables.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTables.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.util.Set; - import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.TableReference; +import java.util.Set; public final class HiddenTables { private HiddenTables() { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HostPartitioner.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HostPartitioner.java index 4b5e7043e31..09c8980f912 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HostPartitioner.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HostPartitioner.java @@ -15,17 +15,16 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.net.InetSocketAddress; -import java.nio.ByteBuffer; -import java.util.List; -import java.util.Map; - import com.google.common.base.Function; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Maps; import com.google.common.collect.Multimaps; import com.palantir.atlasdb.keyvalue.api.Cell; +import java.net.InetSocketAddress; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.Map; final class HostPartitioner { private HostPartitioner() { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/InstrumentedCassandraClient.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/InstrumentedCassandraClient.java index a85db9504a2..bc7c17faa32 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/InstrumentedCassandraClient.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/InstrumentedCassandraClient.java @@ -15,11 +15,15 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.codahale.metrics.MetricRegistry; +import com.google.common.collect.ImmutableMap; +import com.palantir.atlasdb.logging.LoggingArgs; +import com.palantir.tritium.metrics.registry.MetricName; +import com.palantir.tritium.metrics.registry.TaggedMetricRegistry; import java.nio.ByteBuffer; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.apache.cassandra.thrift.ConsistencyLevel; import org.apache.cassandra.thrift.InvalidRequestException; import org.apache.cassandra.thrift.Mutation; @@ -27,12 +31,6 @@ import org.apache.cassandra.thrift.UnavailableException; import org.apache.thrift.TException; -import com.codahale.metrics.MetricRegistry; -import com.google.common.collect.ImmutableMap; -import com.palantir.atlasdb.logging.LoggingArgs; -import com.palantir.tritium.metrics.registry.MetricName; -import com.palantir.tritium.metrics.registry.TaggedMetricRegistry; - @SuppressWarnings({"all"}) // thrift variable names. public class InstrumentedCassandraClient implements AutoDelegate_CassandraClient { private final CassandraClient delegate; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/LightweightOppToken.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/LightweightOppToken.java index f5b3b0bde25..168a0666687 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/LightweightOppToken.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/LightweightOppToken.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.util.Arrays; - import com.google.common.io.BaseEncoding; import com.google.common.primitives.UnsignedBytes; import com.palantir.atlasdb.keyvalue.api.Cell; +import java.util.Arrays; public class LightweightOppToken implements Comparable { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ProfilingCassandraClient.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ProfilingCassandraClient.java index 455b21fa80a..087ad22c28a 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ProfilingCassandraClient.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ProfilingCassandraClient.java @@ -15,11 +15,15 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftObjectSizeUtils; +import com.palantir.atlasdb.logging.KvsProfilingLogger; +import com.palantir.atlasdb.logging.LoggingArgs; +import com.palantir.logsafe.SafeArg; import java.nio.ByteBuffer; import java.util.Collection; import java.util.List; import java.util.Map; - import org.apache.cassandra.thrift.CASResult; import org.apache.cassandra.thrift.Column; import org.apache.cassandra.thrift.ColumnOrSuperColumn; @@ -38,12 +42,6 @@ import org.apache.cassandra.thrift.UnavailableException; import org.apache.thrift.TException; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftObjectSizeUtils; -import com.palantir.atlasdb.logging.KvsProfilingLogger; -import com.palantir.atlasdb.logging.LoggingArgs; -import com.palantir.logsafe.SafeArg; - @SuppressWarnings({"all"}) // thrift variable names. public class ProfilingCassandraClient implements AutoDelegate_CassandraClient { private final CassandraClient client; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/QosCassandraClient.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/QosCassandraClient.java index 9bd092dd613..258772b55e1 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/QosCassandraClient.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/QosCassandraClient.java @@ -16,12 +16,20 @@ package com.palantir.atlasdb.keyvalue.cassandra; +import com.google.common.base.Stopwatch; +import com.google.common.base.Ticker; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.keyvalue.cassandra.thrift.Query; +import com.palantir.atlasdb.keyvalue.cassandra.thrift.QueryWeight; +import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftQueryWeighers; +import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftQueryWeighers.QueryWeigher; +import com.palantir.atlasdb.qos.metrics.QosMetrics; +import com.palantir.atlasdb.util.MetricsManager; import java.nio.ByteBuffer; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; - import org.apache.cassandra.thrift.ColumnOrSuperColumn; import org.apache.cassandra.thrift.Compression; import org.apache.cassandra.thrift.ConsistencyLevel; @@ -39,16 +47,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Stopwatch; -import com.google.common.base.Ticker; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.atlasdb.keyvalue.cassandra.thrift.Query; -import com.palantir.atlasdb.keyvalue.cassandra.thrift.QueryWeight; -import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftQueryWeighers; -import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftQueryWeighers.QueryWeigher; -import com.palantir.atlasdb.qos.metrics.QosMetrics; -import com.palantir.atlasdb.util.MetricsManager; - @SuppressWarnings({"all"}) // thrift variable names. public class QosCassandraClient implements AutoDelegate_CassandraClient { private static final Logger log = LoggerFactory.getLogger(CassandraClient.class); diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RangeLoader.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RangeLoader.java index 54895ce0ff7..a9647cfa128 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RangeLoader.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RangeLoader.java @@ -16,11 +16,6 @@ package com.palantir.atlasdb.keyvalue.cassandra; -import java.util.function.Supplier; - -import org.apache.cassandra.thrift.ConsistencyLevel; -import org.apache.cassandra.thrift.SlicePredicate; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.keyvalue.api.RangeRequest; import com.palantir.atlasdb.keyvalue.api.RowResult; @@ -34,6 +29,9 @@ import com.palantir.atlasdb.util.MetricsManager; import com.palantir.common.base.ClosableIterator; import com.palantir.common.base.ClosableIterators; +import java.util.function.Supplier; +import org.apache.cassandra.thrift.ConsistencyLevel; +import org.apache.cassandra.thrift.SlicePredicate; public class RangeLoader { private final CassandraClientPool clientPool; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ResultsExtractor.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ResultsExtractor.java index cb3d773fe0a..817180cdb7a 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ResultsExtractor.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ResultsExtractor.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.nio.ByteBuffer; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.SortedMap; - -import org.apache.cassandra.thrift.ColumnOrSuperColumn; - import com.codahale.metrics.Meter; import com.palantir.atlasdb.AtlasDbMetricNames; import com.palantir.atlasdb.encoding.PtBytes; @@ -37,6 +28,13 @@ import com.palantir.util.Pair; import com.palantir.util.paging.SimpleTokenBackedResultsPage; import com.palantir.util.paging.TokenBackedBasicResultsPage; +import java.nio.ByteBuffer; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.SortedMap; +import org.apache.cassandra.thrift.ColumnOrSuperColumn; public abstract class ResultsExtractor { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RetryableCassandraRequest.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RetryableCassandraRequest.java index 8e77fd47b0f..9d40784a4eb 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RetryableCassandraRequest.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RetryableCassandraRequest.java @@ -15,15 +15,14 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.net.InetSocketAddress; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - import com.google.common.collect.Maps; import com.palantir.atlasdb.keyvalue.api.RetryLimitReachedException; import com.palantir.common.base.FunctionCheckedException; import com.palantir.common.exception.AtlasDbDependencyException; +import java.net.InetSocketAddress; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; public class RetryableCassandraRequest { private final InetSocketAddress preferredHost; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RowColumnRangeExtractor.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RowColumnRangeExtractor.java index bd52cc06fac..8110aced654 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RowColumnRangeExtractor.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RowColumnRangeExtractor.java @@ -15,16 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.nio.ByteBuffer; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.cassandra.thrift.Column; -import org.apache.cassandra.thrift.ColumnOrSuperColumn; - import com.codahale.metrics.Meter; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -33,6 +23,14 @@ import com.palantir.atlasdb.keyvalue.api.Value; import com.palantir.atlasdb.util.MetricsManager; import com.palantir.util.Pair; +import java.nio.ByteBuffer; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import org.apache.cassandra.thrift.Column; +import org.apache.cassandra.thrift.ColumnOrSuperColumn; class RowColumnRangeExtractor { static class RowColumnRangeResult { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TaskRunner.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TaskRunner.java index e22f3290981..5361299890f 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TaskRunner.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TaskRunner.java @@ -15,15 +15,14 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.google.common.collect.Lists; +import com.palantir.common.base.Throwables; import java.util.Collections; import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import com.google.common.collect.Lists; -import com.palantir.common.base.Throwables; - class TaskRunner { private ExecutorService executor; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TracingCassandraClient.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TracingCassandraClient.java index b4cc682d064..f2322dd5f2f 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TracingCassandraClient.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TracingCassandraClient.java @@ -15,10 +15,12 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.logging.LoggingArgs; +import com.palantir.atlasdb.tracing.CloseableTrace; import java.nio.ByteBuffer; import java.util.List; import java.util.Map; - import org.apache.cassandra.thrift.CASResult; import org.apache.cassandra.thrift.Column; import org.apache.cassandra.thrift.ColumnOrSuperColumn; @@ -37,10 +39,6 @@ import org.apache.cassandra.thrift.UnavailableException; import org.apache.thrift.TException; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.atlasdb.logging.LoggingArgs; -import com.palantir.atlasdb.tracing.CloseableTrace; - @SuppressWarnings({"all"}) // thrift variable names. public class TracingCassandraClient implements AutoDelegate_CassandraClient { private static final String SERVICE_NAME = "cassandra-thrift-client"; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TracingQueryRunner.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TracingQueryRunner.java index eb536b1f3de..9cf697f91a2 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TracingQueryRunner.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TracingQueryRunner.java @@ -15,19 +15,17 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.google.common.base.Stopwatch; +import com.google.common.collect.ImmutableSet; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.keyvalue.impl.TracingPrefsConfig; import java.nio.ByteBuffer; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; - import org.apache.thrift.TException; import org.slf4j.Logger; -import com.google.common.base.Stopwatch; -import com.google.common.collect.ImmutableSet; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.atlasdb.keyvalue.impl.TracingPrefsConfig; - public class TracingQueryRunner { private final Logger log; private final TracingPrefsConfig tracingPrefs; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ValueExtractor.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ValueExtractor.java index 8688df068c5..79d230159d2 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ValueExtractor.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ValueExtractor.java @@ -15,14 +15,13 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; -import java.util.Map; - import com.codahale.metrics.Meter; import com.google.common.collect.Maps; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.ColumnSelection; import com.palantir.atlasdb.keyvalue.api.Value; import com.palantir.atlasdb.util.MetricsManager; +import java.util.Map; class ValueExtractor extends ResultsExtractor { private final Map collector; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/WrappingQueryRunner.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/WrappingQueryRunner.java index b49e73a2e6f..8f234f963fc 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/WrappingQueryRunner.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/WrappingQueryRunner.java @@ -15,11 +15,13 @@ */ package com.palantir.atlasdb.keyvalue.cassandra; +import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.keyvalue.cassandra.thrift.MutationMap; import java.nio.ByteBuffer; import java.util.List; import java.util.Map; import java.util.Set; - import org.apache.cassandra.thrift.ColumnOrSuperColumn; import org.apache.cassandra.thrift.ConsistencyLevel; import org.apache.cassandra.thrift.KeyPredicate; @@ -27,10 +29,6 @@ import org.apache.cassandra.thrift.UnavailableException; import org.apache.thrift.TException; -import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.atlasdb.keyvalue.cassandra.thrift.MutationMap; - /** * Executes Thrift queries using the supplied {@link TracingQueryRunner}, wrapping {@link UnavailableException} with * {@link InsufficientConsistencyException}. diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/query/forming/CacheQueryFormer.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/query/forming/CacheQueryFormer.java index 830a8e54a70..d5b4daa7372 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/query/forming/CacheQueryFormer.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/query/forming/CacheQueryFormer.java @@ -16,14 +16,13 @@ package com.palantir.atlasdb.keyvalue.cassandra.async.query.forming; -import org.immutables.value.Value; - import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.impl.AbstractKeyValueService; import com.palantir.tritium.metrics.caffeine.CaffeineCacheStats; import com.palantir.tritium.metrics.registry.TaggedMetricRegistry; +import org.immutables.value.Value; public final class CacheQueryFormer implements QueryFormer { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetResponseDecoder.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetResponseDecoder.java index 8b69f1a8f09..60cc3e129da 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetResponseDecoder.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetResponseDecoder.java @@ -15,20 +15,17 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.cas; -import java.util.Arrays; -import java.util.List; - -import org.apache.cassandra.thrift.Column; -import org.apache.cassandra.thrift.CqlResult; -import org.apache.cassandra.thrift.CqlRow; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult; import com.palantir.atlasdb.keyvalue.impl.ImmutableCheckAndSetResult; - +import java.util.Arrays; +import java.util.List; import okio.ByteString; +import org.apache.cassandra.thrift.Column; +import org.apache.cassandra.thrift.CqlResult; +import org.apache.cassandra.thrift.CqlRow; final class CheckAndSetResponseDecoder { private static final String APPLIED_COLUMN = "[applied]"; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetRunner.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetRunner.java index 4697f283895..a27bf0aaf26 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetRunner.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetRunner.java @@ -15,20 +15,18 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.cas; -import org.apache.cassandra.thrift.Compression; -import org.apache.cassandra.thrift.ConsistencyLevel; -import org.apache.cassandra.thrift.CqlResult; -import org.apache.cassandra.thrift.UnavailableException; -import org.apache.thrift.TException; - import com.palantir.atlasdb.keyvalue.api.CheckAndSetRequest; import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.cassandra.CassandraClient; import com.palantir.atlasdb.keyvalue.cassandra.TracingQueryRunner; import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult; - import okio.ByteString; +import org.apache.cassandra.thrift.Compression; +import org.apache.cassandra.thrift.ConsistencyLevel; +import org.apache.cassandra.thrift.CqlResult; +import org.apache.cassandra.thrift.UnavailableException; +import org.apache.thrift.TException; public class CheckAndSetRunner { private final TracingQueryRunner queryRunner; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/CassandraRangePagingIterable.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/CassandraRangePagingIterable.java index 84eedc8ed5a..7b7c31b0557 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/CassandraRangePagingIterable.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/CassandraRangePagingIterable.java @@ -15,16 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.paging; -import java.nio.ByteBuffer; -import java.util.List; -import java.util.Map; -import java.util.function.Supplier; - -import org.apache.cassandra.thrift.ColumnOrSuperColumn; -import org.apache.cassandra.thrift.KeyRange; -import org.apache.cassandra.thrift.KeySlice; -import org.apache.cassandra.thrift.SlicePredicate; - import com.palantir.atlasdb.keyvalue.api.ColumnSelection; import com.palantir.atlasdb.keyvalue.api.RangeRequest; import com.palantir.atlasdb.keyvalue.api.RangeRequests; @@ -33,6 +23,14 @@ import com.palantir.util.paging.AbstractPagingIterable; import com.palantir.util.paging.SimpleTokenBackedResultsPage; import com.palantir.util.paging.TokenBackedBasicResultsPage; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.Map; +import java.util.function.Supplier; +import org.apache.cassandra.thrift.ColumnOrSuperColumn; +import org.apache.cassandra.thrift.KeyRange; +import org.apache.cassandra.thrift.KeySlice; +import org.apache.cassandra.thrift.SlicePredicate; public class CassandraRangePagingIterable extends AbstractPagingIterable, TokenBackedBasicResultsPage, byte[]>> { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ColumnGetter.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ColumnGetter.java index c210b6b4d12..eb8d315815e 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ColumnGetter.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ColumnGetter.java @@ -18,7 +18,6 @@ import java.nio.ByteBuffer; import java.util.List; import java.util.Map; - import org.apache.cassandra.thrift.ColumnOrSuperColumn; import org.apache.cassandra.thrift.KeySlice; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ColumnGetters.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ColumnGetters.java index 625ea065676..6927d3c76b5 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ColumnGetters.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ColumnGetters.java @@ -15,15 +15,13 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.paging; +import com.google.common.collect.Maps; import java.nio.ByteBuffer; import java.util.List; import java.util.Map; - import org.apache.cassandra.thrift.ColumnOrSuperColumn; import org.apache.cassandra.thrift.KeySlice; -import com.google.common.collect.Maps; - final class ColumnGetters { private ColumnGetters() { // Utility class diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/RowGetter.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/RowGetter.java index 2f201aa9f06..68b8e00a9bd 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/RowGetter.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/RowGetter.java @@ -15,16 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.paging; -import java.net.InetSocketAddress; -import java.util.List; -import java.util.stream.Collectors; - -import org.apache.cassandra.thrift.ConsistencyLevel; -import org.apache.cassandra.thrift.KeyRange; -import org.apache.cassandra.thrift.KeySlice; -import org.apache.cassandra.thrift.SlicePredicate; -import org.apache.cassandra.thrift.UnavailableException; - import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.cassandra.CassandraClient; @@ -33,6 +23,14 @@ import com.palantir.atlasdb.keyvalue.cassandra.thrift.SlicePredicates; import com.palantir.common.base.FunctionCheckedException; import com.palantir.common.base.Throwables; +import java.net.InetSocketAddress; +import java.util.List; +import java.util.stream.Collectors; +import org.apache.cassandra.thrift.ConsistencyLevel; +import org.apache.cassandra.thrift.KeyRange; +import org.apache.cassandra.thrift.KeySlice; +import org.apache.cassandra.thrift.SlicePredicate; +import org.apache.cassandra.thrift.UnavailableException; public class RowGetter { private CassandraClientPool clientPool; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ThriftColumnGetter.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ThriftColumnGetter.java index 2c0f6c61381..cfcd9f0d191 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ThriftColumnGetter.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ThriftColumnGetter.java @@ -18,7 +18,6 @@ import java.nio.ByteBuffer; import java.util.List; import java.util.Map; - import org.apache.cassandra.thrift.ColumnOrSuperColumn; import org.apache.cassandra.thrift.KeySlice; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraClientPoolMetrics.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraClientPoolMetrics.java index f6ca865ed6d..53982775257 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraClientPoolMetrics.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraClientPoolMetrics.java @@ -15,17 +15,16 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.pool; +import com.codahale.metrics.Meter; +import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPool; +import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPoolingContainer; +import com.palantir.atlasdb.util.MetricsManager; import java.net.InetSocketAddress; import java.util.HashMap; import java.util.Map; import java.util.function.Consumer; import java.util.function.Supplier; -import com.codahale.metrics.Meter; -import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPool; -import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPoolingContainer; -import com.palantir.atlasdb.util.MetricsManager; - public class CassandraClientPoolMetrics { private final MetricsManager metricsManager; private final RequestMetrics aggregateMetrics; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraService.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraService.java index ab30ed1d4f1..a9298ea219c 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraService.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraService.java @@ -15,24 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.pool; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.UnknownHostException; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -import org.apache.cassandra.thrift.TokenRange; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableRangeMap; @@ -53,6 +35,22 @@ import com.palantir.common.base.Throwables; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.UnknownHostException; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import org.apache.cassandra.thrift.TokenRange; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class CassandraService implements AutoCloseable { // TODO(tboam): keep logging on old class? diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/WeightedHosts.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/WeightedHosts.java index b9059834896..724f4bc04a2 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/WeightedHosts.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/WeightedHosts.java @@ -15,6 +15,8 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.pool; +import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPoolingContainer; +import com.palantir.logsafe.Preconditions; import java.net.InetSocketAddress; import java.util.HashMap; import java.util.Map; @@ -22,9 +24,6 @@ import java.util.TreeMap; import java.util.concurrent.ThreadLocalRandom; -import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPoolingContainer; -import com.palantir.logsafe.Preconditions; - /** * Weights hosts inversely by the number of active connections. {@link #getRandomHost()} should then be used to * pick a random host diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CandidateRowForSweeping.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CandidateRowForSweeping.java index 7f9fa2a2c1f..a44c45d7e23 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CandidateRowForSweeping.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CandidateRowForSweeping.java @@ -15,17 +15,15 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.sweep; -import java.util.List; -import java.util.Set; -import java.util.SortedMap; - -import org.immutables.value.Value; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import com.google.common.primitives.UnsignedBytes; import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping; import com.palantir.atlasdb.keyvalue.api.RowResult; +import java.util.List; +import java.util.Set; +import java.util.SortedMap; +import org.immutables.value.Value; @Value.Immutable public interface CandidateRowForSweeping { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CandidateRowsForSweepingIterator.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CandidateRowsForSweepingIterator.java index 6656a9a9f5c..68f1b903805 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CandidateRowsForSweepingIterator.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CandidateRowsForSweepingIterator.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.sweep; -import java.util.List; - import com.google.common.collect.AbstractIterator; import com.google.common.collect.Iterables; import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; @@ -26,6 +24,7 @@ import com.palantir.atlasdb.keyvalue.cassandra.CqlExecutor; import com.palantir.atlasdb.keyvalue.cassandra.paging.RowGetter; import com.palantir.common.base.ClosableIterator; +import java.util.List; public class CandidateRowsForSweepingIterator extends AbstractIterator> implements ClosableIterator> { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CellWithTimestamp.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CellWithTimestamp.java index 6314b54d3ac..d734c89231a 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CellWithTimestamp.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CellWithTimestamp.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.sweep; -import org.immutables.value.Value; - import com.google.common.base.Preconditions; import com.palantir.atlasdb.keyvalue.api.Cell; +import org.immutables.value.Value; @Value.Immutable public abstract class CellWithTimestamp { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CellWithTimestamps.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CellWithTimestamps.java index 1f8fc5971ae..b58ddaf7171 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CellWithTimestamps.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CellWithTimestamps.java @@ -15,18 +15,16 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.sweep; +import com.google.common.collect.Lists; +import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping; +import com.palantir.atlasdb.keyvalue.api.Cell; +import com.palantir.atlasdb.keyvalue.api.ImmutableCandidateCellForSweeping; import java.util.Collections; import java.util.List; import java.util.function.Predicate; import java.util.stream.Collectors; - import org.immutables.value.Value; -import com.google.common.collect.Lists; -import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping; -import com.palantir.atlasdb.keyvalue.api.Cell; -import com.palantir.atlasdb.keyvalue.api.ImmutableCandidateCellForSweeping; - @Value.Immutable public interface CellWithTimestamps { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetCandidateRowsForSweeping.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetCandidateRowsForSweeping.java index f2abcc4756e..714f354b04a 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetCandidateRowsForSweeping.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetCandidateRowsForSweeping.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.sweep; -import java.nio.ByteBuffer; -import java.util.Collections; -import java.util.Comparator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - import com.google.common.collect.Lists; import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping; @@ -32,6 +23,14 @@ import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.cassandra.CqlExecutor; import com.palantir.atlasdb.keyvalue.cassandra.paging.RowGetter; +import java.nio.ByteBuffer; +import java.util.Collections; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; public class GetCandidateRowsForSweeping { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetCellTimestamps.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetCellTimestamps.java index e0e7fca1315..e64530f9a3e 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetCellTimestamps.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetCellTimestamps.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.sweep; -import java.util.Collection; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ExecutorService; -import java.util.stream.Collectors; - import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; @@ -32,6 +25,12 @@ import com.palantir.atlasdb.keyvalue.cassandra.CqlExecutor; import com.palantir.atlasdb.keyvalue.cassandra.paging.RowGetter; import com.palantir.common.concurrent.PTExecutors; +import java.util.Collection; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutorService; +import java.util.stream.Collectors; public class GetCellTimestamps { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetEmptyLatestValues.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetEmptyLatestValues.java index 6ba1dd83870..2ab4f96ca59 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetEmptyLatestValues.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetEmptyLatestValues.java @@ -15,17 +15,16 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.sweep; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.api.Value; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; public class GetEmptyLatestValues { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/ValuesLoader.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/ValuesLoader.java index a6f6386b90c..2c50849e035 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/ValuesLoader.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/ValuesLoader.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.sweep; -import java.util.Map; -import java.util.Set; - import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.api.Value; +import java.util.Map; +import java.util.Set; public interface ValuesLoader { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/MutationMap.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/MutationMap.java index fb2e197aaba..991f45d2ae1 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/MutationMap.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/MutationMap.java @@ -15,19 +15,16 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.thrift; -import java.nio.ByteBuffer; -import java.util.List; -import java.util.Map; - -import javax.annotation.concurrent.NotThreadSafe; - -import org.apache.cassandra.thrift.Mutation; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.impl.AbstractKeyValueService; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.Map; +import javax.annotation.concurrent.NotThreadSafe; +import org.apache.cassandra.thrift.Mutation; @NotThreadSafe public class MutationMap { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/Mutations.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/Mutations.java index 8fb52ea69fd..47a4cb276fe 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/Mutations.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/Mutations.java @@ -15,14 +15,12 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.thrift; +import com.palantir.atlasdb.keyvalue.api.TimestampRangeDelete; import java.util.function.ToLongFunction; - import org.apache.cassandra.thrift.Deletion; import org.apache.cassandra.thrift.Mutation; import org.apache.cassandra.thrift.SlicePredicate; -import com.palantir.atlasdb.keyvalue.api.TimestampRangeDelete; - public final class Mutations { private Mutations() { } diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/QueryWeight.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/QueryWeight.java index 82361c32c4e..e054edcf3cc 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/QueryWeight.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/QueryWeight.java @@ -16,7 +16,6 @@ package com.palantir.atlasdb.keyvalue.cassandra.thrift; import java.util.concurrent.TimeUnit; - import org.immutables.value.Value; @Value.Immutable diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/SlicePredicates.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/SlicePredicates.java index 8b69b86c6ce..e262640d094 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/SlicePredicates.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/SlicePredicates.java @@ -15,15 +15,13 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.thrift; +import com.palantir.atlasdb.encoding.PtBytes; +import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServices; import java.nio.ByteBuffer; - import org.apache.cassandra.thrift.SlicePredicate; import org.apache.cassandra.thrift.SliceRange; import org.immutables.value.Value; -import com.palantir.atlasdb.encoding.PtBytes; -import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServices; - public final class SlicePredicates { private SlicePredicates() { } diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftObjectSizeUtils.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftObjectSizeUtils.java index 382147a7b9f..071eb016684 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftObjectSizeUtils.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftObjectSizeUtils.java @@ -15,6 +15,7 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.thrift; +import com.google.common.collect.Maps; import java.nio.ByteBuffer; import java.util.Collection; import java.util.HashMap; @@ -22,7 +23,6 @@ import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; - import org.apache.cassandra.thrift.Column; import org.apache.cassandra.thrift.ColumnOrSuperColumn; import org.apache.cassandra.thrift.CounterColumn; @@ -37,8 +37,6 @@ import org.apache.cassandra.thrift.SliceRange; import org.apache.cassandra.thrift.SuperColumn; -import com.google.common.collect.Maps; - public final class ThriftObjectSizeUtils { private static final long ONE_BYTE = 1; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftQueryWeighers.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftQueryWeighers.java index 5a35db6ac1d..83c1739d5f2 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftQueryWeighers.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftQueryWeighers.java @@ -15,12 +15,13 @@ */ package com.palantir.atlasdb.keyvalue.cassandra.thrift; +import com.google.common.base.Suppliers; +import com.palantir.atlasdb.keyvalue.cassandra.CassandraClient; import java.nio.ByteBuffer; import java.util.List; import java.util.Map; import java.util.function.Function; import java.util.function.Supplier; - import org.apache.cassandra.thrift.ColumnOrSuperColumn; import org.apache.cassandra.thrift.CqlResult; import org.apache.cassandra.thrift.KeyRange; @@ -29,9 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Suppliers; -import com.palantir.atlasdb.keyvalue.cassandra.CassandraClient; - public final class ThriftQueryWeighers { private static final Logger log = LoggerFactory.getLogger(CassandraClient.class); diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/ThriftObjectSizeUtilsTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/ThriftObjectSizeUtilsTest.java index a165497d2e0..bb365225d8d 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/ThriftObjectSizeUtilsTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/ThriftObjectSizeUtilsTest.java @@ -17,10 +17,12 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftObjectSizeUtils; import java.nio.ByteBuffer; import java.util.List; import java.util.Map; - import org.apache.cassandra.thrift.Column; import org.apache.cassandra.thrift.ColumnOrSuperColumn; import org.apache.cassandra.thrift.CqlResult; @@ -33,10 +35,6 @@ import org.apache.cassandra.thrift.SuperColumn; import org.junit.Test; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftObjectSizeUtils; - public class ThriftObjectSizeUtilsTest { private static final String TEST_NAME = "foo"; private static final ByteBuffer TEST_NAME_BYTES = ByteBuffer.wrap(TEST_NAME.getBytes()); diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactoryTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactoryTest.java index c417e32b3b2..c661571c9d2 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactoryTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactoryTest.java @@ -19,17 +19,15 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.Assert.assertEquals; +import com.google.common.collect.ImmutableSet; +import com.palantir.atlasdb.spi.KeyValueServiceConfigHelper; +import com.palantir.atlasdb.spi.KeyValueServiceRuntimeConfig; import java.net.InetSocketAddress; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; - import org.junit.Test; -import com.google.common.collect.ImmutableSet; -import com.palantir.atlasdb.spi.KeyValueServiceConfigHelper; -import com.palantir.atlasdb.spi.KeyValueServiceRuntimeConfig; - public class CassandraAtlasDbFactoryTest { private static final String KEYSPACE = "ks"; private static final String KEYSPACE_2 = "ks2"; diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfigsTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfigsTest.java index de6dc10a539..e6b085ea3f3 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfigsTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfigsTest.java @@ -17,19 +17,17 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.palantir.atlasdb.config.AtlasDbConfigs; import java.io.File; import java.io.IOException; import java.net.InetSocketAddress; import java.net.URISyntaxException; import java.net.URL; - import org.junit.Test; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.palantir.atlasdb.config.AtlasDbConfigs; - public class CassandraKeyValueServiceConfigsTest { private static final String KEYSPACE = "ks"; private static final String KEYSPACE_2 = "ks2"; diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraMutationTimestampProvidersTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraMutationTimestampProvidersTest.java index 6ab0ddd4ee4..79f9aeaad11 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraMutationTimestampProvidersTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraMutationTimestampProvidersTest.java @@ -19,7 +19,6 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.LongUnaryOperator; - import org.junit.Test; public class CassandraMutationTimestampProvidersTest { diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraReloadableKvsConfigTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraReloadableKvsConfigTest.java index c89cdad387f..3c61ce51a01 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraReloadableKvsConfigTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraReloadableKvsConfigTest.java @@ -21,7 +21,6 @@ import static org.mockito.Mockito.when; import java.util.Optional; - import org.junit.Before; import org.junit.Test; diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraServersConfigsTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraServersConfigsTest.java index fc3431be146..1a37aebafab 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraServersConfigsTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraServersConfigsTest.java @@ -18,16 +18,14 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.palantir.atlasdb.cassandra.CassandraServersConfigs.CassandraServersConfig; +import com.palantir.atlasdb.config.AtlasDbConfigs; import java.io.File; import java.io.IOException; import java.net.InetSocketAddress; import java.net.URL; - import org.junit.Test; -import com.palantir.atlasdb.cassandra.CassandraServersConfigs.CassandraServersConfig; -import com.palantir.atlasdb.config.AtlasDbConfigs; - public class CassandraServersConfigsTest { private static final InetSocketAddress THRIFT_SERVER_1 = new InetSocketAddress("foo", 44); diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/QosCassandraClientTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/QosCassandraClientTest.java index 540f5b2bdb8..450c984ee66 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/QosCassandraClientTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/QosCassandraClientTest.java @@ -25,12 +25,22 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import com.google.common.base.Ticker; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.palantir.atlasdb.encoding.PtBytes; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.keyvalue.cassandra.CassandraClient; +import com.palantir.atlasdb.keyvalue.cassandra.CqlQuery; +import com.palantir.atlasdb.keyvalue.cassandra.QosCassandraClient; +import com.palantir.atlasdb.keyvalue.cassandra.thrift.QueryWeight; +import com.palantir.atlasdb.keyvalue.cassandra.thrift.SlicePredicates; +import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftQueryWeighers; +import com.palantir.atlasdb.qos.metrics.QosMetrics; import java.nio.ByteBuffer; import java.util.List; import java.util.Map; - import javax.naming.LimitExceededException; - import org.apache.cassandra.thrift.Column; import org.apache.cassandra.thrift.ColumnOrSuperColumn; import org.apache.cassandra.thrift.Compression; @@ -44,19 +54,6 @@ import org.junit.Before; import org.junit.Test; -import com.google.common.base.Ticker; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.palantir.atlasdb.encoding.PtBytes; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.atlasdb.keyvalue.cassandra.CassandraClient; -import com.palantir.atlasdb.keyvalue.cassandra.CqlQuery; -import com.palantir.atlasdb.keyvalue.cassandra.QosCassandraClient; -import com.palantir.atlasdb.keyvalue.cassandra.thrift.QueryWeight; -import com.palantir.atlasdb.keyvalue.cassandra.thrift.SlicePredicates; -import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftQueryWeighers; -import com.palantir.atlasdb.qos.metrics.QosMetrics; - public class QosCassandraClientTest { private final CassandraClient mockClient = mock(CassandraClient.class); private final QosMetrics mockMetrics = mock(QosMetrics.class); diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolTest.java index b20b94ab44e..3c9caf0bc01 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolTest.java @@ -25,6 +25,20 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.codahale.metrics.MetricRegistry; +import com.google.common.base.Throwables; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; +import com.palantir.atlasdb.cassandra.ImmutableDefaultConfig; +import com.palantir.atlasdb.keyvalue.cassandra.pool.CassandraService; +import com.palantir.atlasdb.util.MetricsManagers; +import com.palantir.common.base.FunctionCheckedException; +import com.palantir.common.exception.AtlasDbDependencyException; +import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry; +import com.palantir.tritium.metrics.registry.MetricName; +import com.palantir.tritium.metrics.registry.TaggedMetricRegistry; import java.net.InetSocketAddress; import java.net.SocketTimeoutException; import java.util.Arrays; @@ -39,7 +53,6 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; import java.util.stream.Collectors; - import org.apache.cassandra.thrift.InvalidRequestException; import org.jmock.lib.concurrent.DeterministicScheduler; import org.junit.Before; @@ -48,21 +61,6 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.OngoingStubbing; -import com.codahale.metrics.MetricRegistry; -import com.google.common.base.Throwables; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; -import com.palantir.atlasdb.cassandra.ImmutableDefaultConfig; -import com.palantir.atlasdb.keyvalue.cassandra.pool.CassandraService; -import com.palantir.atlasdb.util.MetricsManagers; -import com.palantir.common.base.FunctionCheckedException; -import com.palantir.common.exception.AtlasDbDependencyException; -import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry; -import com.palantir.tritium.metrics.registry.MetricName; -import com.palantir.tritium.metrics.registry.TaggedMetricRegistry; - public class CassandraClientPoolTest { private static final int POOL_REFRESH_INTERVAL_SECONDS = 3 * 60; private static final int TIME_BETWEEN_EVICTION_RUNS_SECONDS = 20; diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceConfigTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceConfigTest.java index 0ee0a825878..823a08d6c8d 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceConfigTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceConfigTest.java @@ -18,16 +18,14 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import java.net.InetSocketAddress; -import java.nio.file.Paths; - -import org.junit.Test; - import com.palantir.atlasdb.cassandra.CassandraCredentialsConfig; import com.palantir.atlasdb.cassandra.ImmutableCassandraCredentialsConfig; import com.palantir.atlasdb.cassandra.ImmutableCassandraKeyValueServiceConfig; import com.palantir.atlasdb.cassandra.ImmutableDefaultConfig; import com.palantir.conjure.java.api.config.ssl.SslConfiguration; +import java.net.InetSocketAddress; +import java.nio.file.Paths; +import org.junit.Test; public class CassandraKeyValueServiceConfigTest { private static final InetSocketAddress SERVER_ADDRESS = InetSocketAddress.createUnresolved("localhost", 9160); diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicePueTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicePueTest.java index 501dd61d684..1f16af6b887 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicePueTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicePueTest.java @@ -18,17 +18,14 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.util.Map; -import java.util.stream.Collectors; - -import org.junit.Test; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.palantir.atlasdb.keyvalue.api.Cell; - +import java.util.Map; +import java.util.stream.Collectors; import okio.ByteString; +import org.junit.Test; public class CassandraKeyValueServicePueTest { @Test diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicesSchemaConsensusTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicesSchemaConsensusTest.java index 03a5a463305..f49085394dc 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicesSchemaConsensusTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicesSchemaConsensusTest.java @@ -21,20 +21,18 @@ import static org.mockito.Mockito.verify; 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 com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; +import com.palantir.atlasdb.cassandra.ImmutableDefaultConfig; import java.net.InetSocketAddress; import java.util.List; import java.util.Set; - import org.apache.thrift.TException; import org.junit.BeforeClass; import org.junit.Test; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; -import com.palantir.atlasdb.cassandra.ImmutableDefaultConfig; - public class CassandraKeyValueServicesSchemaConsensusTest { private static CassandraKeyValueServiceConfig config = mock(CassandraKeyValueServiceConfig.class); private static CassandraKeyValueServiceConfig waitingConfig = mock(CassandraKeyValueServiceConfig.class); diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicesTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicesTest.java index 6b96ee81d59..0e1f0a9a825 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicesTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicesTest.java @@ -18,11 +18,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.Test; - import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.Value; +import org.junit.Test; public class CassandraKeyValueServicesTest { private static final byte[] DATA = PtBytes.toBytes("data"); diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsWrapperTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsWrapperTest.java index 6ef981ffb39..f0bc72a075d 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsWrapperTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsWrapperTest.java @@ -23,12 +23,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import org.junit.Test; - import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.exception.NotInitializedException; +import org.junit.Test; public class CassandraKvsWrapperTest { private static final CassandraKeyValueServiceImpl kvs = mock(CassandraKeyValueServiceImpl.class); diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraRequestExceptionHandlerTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraRequestExceptionHandlerTest.java index d4e27e199c1..47f3cfd3873 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraRequestExceptionHandlerTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraRequestExceptionHandlerTest.java @@ -19,13 +19,16 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; +import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException; import java.net.SocketTimeoutException; import java.util.Collection; import java.util.NoSuchElementException; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; - import org.apache.cassandra.thrift.InvalidRequestException; import org.apache.cassandra.thrift.TimedOutException; import org.apache.cassandra.thrift.UnavailableException; @@ -33,11 +36,6 @@ import org.junit.Before; import org.junit.Test; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; -import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException; - public class CassandraRequestExceptionHandlerTest { private static final String MESSAGE = "a exception"; private static final Exception CAUSE = new Exception(); diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableOptionsTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableOptionsTest.java index 24dba653bd8..b76517ccd1b 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableOptionsTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableOptionsTest.java @@ -18,9 +18,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.palantir.atlasdb.table.description.TableMetadata; +import org.junit.Test; public class CassandraTableOptionsTest { private static final TableMetadata DENSELY_ACCESSED_WIDE_ROWS_METADATA diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampStoreInvalidatorTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampStoreInvalidatorTest.java index 313a53cfaf3..2f8ba7cb675 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampStoreInvalidatorTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampStoreInvalidatorTest.java @@ -22,11 +22,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; import org.junit.Before; import org.junit.Test; -import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; - public class CassandraTimestampStoreInvalidatorTest { private static final long BACKUP_TIMESTAMP = 42; diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampUtilsTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampUtilsTest.java index 0a3063c5bf4..d93cba383b3 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampUtilsTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampUtilsTest.java @@ -20,19 +20,17 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.palantir.atlasdb.encoding.PtBytes; +import com.palantir.util.Pair; import java.util.List; import java.util.Map; - import org.apache.cassandra.thrift.Column; import org.apache.cassandra.thrift.CqlResult; import org.apache.cassandra.thrift.CqlRow; import org.junit.Test; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.palantir.atlasdb.encoding.PtBytes; -import com.palantir.util.Pair; - public class CassandraTimestampUtilsTest { private static final byte[] KEY_1 = {120}; private static final String COLUMN_NAME_1 = "foo"; diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifierTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifierTest.java index 6f4da3dc6e1..0e66f1f69dd 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifierTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifierTest.java @@ -20,20 +20,18 @@ import static org.mockito.Mockito.mock; 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 com.google.common.collect.ImmutableSortedSet; +import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; import java.util.Arrays; - import org.apache.cassandra.thrift.EndpointDetails; import org.apache.cassandra.thrift.KsDef; import org.apache.cassandra.thrift.TokenRange; import org.apache.thrift.TException; import org.junit.Test; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.ImmutableSortedSet; -import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; - public class CassandraVerifierTest { private static final String DC_1 = "dc1"; private static final String DC_2 = "dc2"; diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoadingBatcherTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoadingBatcherTest.java index d10d5b00aa0..dc8a64e418a 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoadingBatcherTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoadingBatcherTest.java @@ -23,6 +23,13 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; +import com.google.common.collect.ImmutableList; +import com.google.common.primitives.UnsignedBytes; +import com.palantir.atlasdb.cassandra.CassandraCellLoadingConfig; +import com.palantir.atlasdb.cassandra.ImmutableCassandraCellLoadingConfig; +import com.palantir.atlasdb.encoding.PtBytes; +import com.palantir.atlasdb.keyvalue.api.Cell; +import com.palantir.atlasdb.keyvalue.api.TableReference; import java.net.InetSocketAddress; import java.util.ArrayList; import java.util.Arrays; @@ -34,17 +41,8 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.LongStream; - import org.junit.Test; -import com.google.common.collect.ImmutableList; -import com.google.common.primitives.UnsignedBytes; -import com.palantir.atlasdb.cassandra.CassandraCellLoadingConfig; -import com.palantir.atlasdb.cassandra.ImmutableCassandraCellLoadingConfig; -import com.palantir.atlasdb.encoding.PtBytes; -import com.palantir.atlasdb.keyvalue.api.Cell; -import com.palantir.atlasdb.keyvalue.api.TableReference; - @SuppressWarnings("unchecked") // AssertJ assertions public class CellLoadingBatcherTest { private static final int CROSS_COLUMN_LIMIT = 3; diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/ColumnFamilyDefinitionsTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/ColumnFamilyDefinitionsTest.java index 71a1eb60ae3..d5c414d960f 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/ColumnFamilyDefinitionsTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/ColumnFamilyDefinitionsTest.java @@ -18,14 +18,13 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.apache.cassandra.thrift.CfDef; -import org.junit.Test; - import com.google.common.collect.ImmutableMap; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.atlasdb.table.description.TableMetadata; +import org.apache.cassandra.thrift.CfDef; +import org.junit.Test; public class ColumnFamilyDefinitionsTest { private static final int FOUR_DAYS_IN_SECONDS = 4 * 24 * 60 * 60; diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutorTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutorTest.java index a6792b3b156..16d7380e3b2 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutorTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutorTest.java @@ -22,15 +22,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.nio.ByteBuffer; -import java.util.concurrent.TimeUnit; - -import org.apache.cassandra.thrift.CqlPreparedResult; -import org.apache.cassandra.thrift.CqlResult; -import org.junit.Before; -import org.junit.Test; -import org.mockito.ArgumentMatcher; - import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.Uninterruptibles; import com.palantir.atlasdb.AtlasDbConstants; @@ -38,6 +29,13 @@ import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.common.concurrent.PTExecutors; +import java.nio.ByteBuffer; +import java.util.concurrent.TimeUnit; +import org.apache.cassandra.thrift.CqlPreparedResult; +import org.apache.cassandra.thrift.CqlResult; +import org.junit.Before; +import org.junit.Test; +import org.mockito.ArgumentMatcher; public class CqlExecutorTest { diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTablesTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTablesTest.java index d8fd16dfe91..bd2e590bb82 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTablesTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTablesTest.java @@ -19,10 +19,9 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import org.junit.Test; - import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.TableReference; +import org.junit.Test; public class HiddenTablesTest { @Test diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/ProfilingCassandraClientTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/ProfilingCassandraClientTest.java index b792388ea50..38624be81c9 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/ProfilingCassandraClientTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/ProfilingCassandraClientTest.java @@ -22,9 +22,12 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.palantir.atlasdb.encoding.PtBytes; +import com.palantir.atlasdb.keyvalue.api.TableReference; import java.nio.ByteBuffer; import java.util.List; - import org.apache.cassandra.thrift.Column; import org.apache.cassandra.thrift.ColumnOrSuperColumn; import org.apache.cassandra.thrift.Compression; @@ -37,11 +40,6 @@ import org.junit.After; import org.junit.Test; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.palantir.atlasdb.encoding.PtBytes; -import com.palantir.atlasdb.keyvalue.api.TableReference; - public class ProfilingCassandraClientTest { private static final CqlQuery CQL_QUERY = CqlQuery.builder() .safeQueryFormat("SELECT * FROM atlasdb.foo LIMIT 1;") diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/RetryableCassandraRequestTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/RetryableCassandraRequestTest.java index 1e4f33f9552..754449c8bda 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/RetryableCassandraRequestTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/RetryableCassandraRequestTest.java @@ -18,13 +18,11 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; +import com.palantir.common.base.FunctionCheckedException; import java.net.InetSocketAddress; - import org.junit.Before; import org.junit.Test; -import com.palantir.common.base.FunctionCheckedException; - public class RetryableCassandraRequestTest { private static final int DEFAULT_PORT = 5000; private static final String HOSTNAME_1 = "1.0.0.0"; diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/async/query/forming/QueryFormingTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/async/query/forming/QueryFormingTest.java index 58c6c1162f8..02c670bbdfb 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/async/query/forming/QueryFormingTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/async/query/forming/QueryFormingTest.java @@ -18,11 +18,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.tritium.metrics.registry.SharedTaggedMetricRegistries; +import org.junit.Test; public class QueryFormingTest { diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetQueriesTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetQueriesTest.java index 9b71a7fdd66..1a19041d947 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetQueriesTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetQueriesTest.java @@ -17,12 +17,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.util.Arrays; -import java.util.Map; -import java.util.concurrent.atomic.AtomicReference; - -import org.junit.Test; - import com.google.common.base.Stopwatch; import com.google.common.collect.Maps; import com.palantir.atlasdb.encoding.PtBytes; @@ -31,6 +25,10 @@ import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.cassandra.CqlQuery; import com.palantir.logsafe.Arg; +import java.util.Arrays; +import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; +import org.junit.Test; public class CheckAndSetQueriesTest { private static final TableReference TABLE_REFERENCE = TableReference.createFromFullyQualifiedName("ns.table"); diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraServiceTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraServiceTest.java index 761c64be319..74c2c932445 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraServiceTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraServiceTest.java @@ -19,12 +19,6 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import java.net.InetSocketAddress; -import java.net.UnknownHostException; -import java.util.Optional; - -import org.junit.Test; - import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; import com.palantir.atlasdb.cassandra.ImmutableCassandraCredentialsConfig; @@ -33,6 +27,10 @@ import com.palantir.atlasdb.keyvalue.cassandra.Blacklist; import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPoolingContainer; import com.palantir.atlasdb.util.MetricsManagers; +import java.net.InetSocketAddress; +import java.net.UnknownHostException; +import java.util.Optional; +import org.junit.Test; public class CassandraServiceTest { private static final int DEFAULT_PORT = 5000; diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/WeightedHostsTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/WeightedHostsTest.java index 3409642a6fb..ea2643f0462 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/WeightedHostsTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/WeightedHostsTest.java @@ -18,18 +18,16 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; +import com.google.common.collect.ImmutableMap; +import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPoolingContainer; import java.net.InetSocketAddress; import java.util.HashMap; import java.util.Map; import java.util.NavigableMap; - import org.hamcrest.Matchers; import org.junit.Test; import org.mockito.Mockito; -import com.google.common.collect.ImmutableMap; -import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPoolingContainer; - public class WeightedHostsTest { @Test diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftQueryWeighersTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftQueryWeighersTest.java index bf754364d04..ab9ad7c4215 100644 --- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftQueryWeighersTest.java +++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftQueryWeighersTest.java @@ -17,10 +17,12 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftQueryWeighers.QueryWeigher; import java.nio.ByteBuffer; import java.util.List; import java.util.Map; - import org.apache.cassandra.thrift.ColumnOrSuperColumn; import org.apache.cassandra.thrift.CqlResult; import org.apache.cassandra.thrift.KeyRange; @@ -28,10 +30,6 @@ import org.apache.cassandra.thrift.Mutation; import org.junit.Test; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftQueryWeighers.QueryWeigher; - public class ThriftQueryWeighersTest { private static final ByteBuffer BYTES1 = ByteBuffer.allocate(3); diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/AtlasCli.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/AtlasCli.java index 4b4d386e848..177ba9a4faa 100644 --- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/AtlasCli.java +++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/AtlasCli.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.cli; -import java.util.concurrent.Callable; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.palantir.atlasdb.cli.command.KvsMigrationCommand; import com.palantir.atlasdb.cli.command.ReadPunchTableCommand; import com.palantir.atlasdb.cli.command.ScrubQueueMigrationCommand; @@ -27,9 +22,11 @@ import com.palantir.atlasdb.cli.command.timestamp.CleanTransactionRange; import com.palantir.atlasdb.cli.command.timestamp.FastForwardTimestamp; import com.palantir.atlasdb.cli.command.timestamp.FetchTimestamp; - import io.airlift.airline.Cli; import io.airlift.airline.Help; +import java.util.concurrent.Callable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class AtlasCli { diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/AbstractCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/AbstractCommand.java index 3c8d98936db..7a175bf9bd2 100644 --- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/AbstractCommand.java +++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/AbstractCommand.java @@ -15,18 +15,16 @@ */ package com.palantir.atlasdb.cli.command; -import java.io.File; -import java.io.IOException; -import java.util.concurrent.Callable; - import com.palantir.atlasdb.config.AtlasDbConfig; import com.palantir.atlasdb.config.AtlasDbConfigs; import com.palantir.atlasdb.config.AtlasDbRuntimeConfig; import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; import com.palantir.logsafe.exceptions.SafeRuntimeException; - import io.airlift.airline.Option; import io.airlift.airline.OptionType; +import java.io.File; +import java.io.IOException; +import java.util.concurrent.Callable; public abstract class AbstractCommand implements Callable { diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KeyValueServiceMigrators.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KeyValueServiceMigrators.java index e5bfc06e4b3..58b266fd94a 100644 --- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KeyValueServiceMigrators.java +++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KeyValueServiceMigrators.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.cli.command; -import org.immutables.value.Value; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableMap; @@ -30,6 +27,8 @@ import com.palantir.logsafe.Preconditions; import com.palantir.timestamp.TimestampManagementService; import com.palantir.timestamp.TimestampService; +import org.immutables.value.Value; +import org.slf4j.LoggerFactory; public final class KeyValueServiceMigrators { private static final OutputPrinter printer diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KvsMigrationCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KvsMigrationCommand.java index b2283874dc5..1bcca3e1418 100644 --- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KvsMigrationCommand.java +++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KvsMigrationCommand.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.cli.command; -import java.io.File; -import java.io.IOException; -import java.util.concurrent.Callable; - -import org.slf4j.LoggerFactory; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.cli.output.OutputPrinter; @@ -32,10 +26,13 @@ import com.palantir.atlasdb.services.AtlasDbServices; import com.palantir.atlasdb.services.DaggerAtlasDbServices; import com.palantir.atlasdb.services.ServicesConfigModule; - import io.airlift.airline.Command; import io.airlift.airline.Option; import io.airlift.airline.OptionType; +import java.io.File; +import java.io.IOException; +import java.util.concurrent.Callable; +import org.slf4j.LoggerFactory; @Command(name = "migrate", description = "Migrate your data from one key value service to another.") public class KvsMigrationCommand implements Callable { diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/ReadPunchTableCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/ReadPunchTableCommand.java index bf553eaae6b..6ed57a5be5e 100644 --- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/ReadPunchTableCommand.java +++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/ReadPunchTableCommand.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.cli.command; -import java.time.Instant; -import java.time.ZoneId; -import java.time.ZonedDateTime; - -import org.slf4j.LoggerFactory; - import com.palantir.atlasdb.cleaner.KeyValueServicePuncherStore; import com.palantir.atlasdb.cleaner.PuncherStore; import com.palantir.atlasdb.cli.command.timestamp.AbstractTimestampCommand; @@ -29,10 +23,13 @@ import com.palantir.atlasdb.services.AtlasDbServices; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; - import io.airlift.airline.Command; import io.airlift.airline.Option; import io.airlift.airline.OptionType; +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import org.slf4j.LoggerFactory; @Command(name = "read-punch-table", description = "Given an epoch time in millis, read the timestamp recorded" + " just before it in the punch table.") diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/ScrubQueueMigrationCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/ScrubQueueMigrationCommand.java index 0bb5cfbc99f..b16f0ef1030 100644 --- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/ScrubQueueMigrationCommand.java +++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/ScrubQueueMigrationCommand.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.cli.command; -import java.io.PrintWriter; -import java.util.Map.Entry; -import java.util.concurrent.TimeUnit; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.MoreObjects; import com.google.common.base.Stopwatch; import com.google.common.collect.ArrayListMultimap; @@ -38,9 +32,12 @@ import com.palantir.atlasdb.services.AtlasDbServices; import com.palantir.common.base.ClosableIterator; import com.palantir.logsafe.Preconditions; - import io.airlift.airline.Command; import io.airlift.airline.Option; +import java.io.PrintWriter; +import java.util.Map.Entry; +import java.util.concurrent.TimeUnit; +import org.apache.commons.lang3.StringUtils; @Command(name = "scrub-queue-migration", description = "Move the contents of the old scrub queue into the new " diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SingleBackendCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SingleBackendCommand.java index d9a84dba1f5..cac570b856e 100644 --- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SingleBackendCommand.java +++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SingleBackendCommand.java @@ -15,17 +15,15 @@ */ package com.palantir.atlasdb.cli.command; -import java.io.IOException; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.palantir.atlasdb.services.AtlasDbServices; import com.palantir.atlasdb.services.AtlasDbServicesFactory; import com.palantir.atlasdb.services.DaggerAtlasDbServices; import com.palantir.atlasdb.services.ServicesConfigModule; import com.palantir.common.base.Throwables; import com.palantir.logsafe.Preconditions; +import java.io.IOException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class SingleBackendCommand extends AbstractCommand { private static final Logger log = LoggerFactory.getLogger(SingleBackendCommand.class); diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SweepCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SweepCommand.java index b6248efe53f..8197806474b 100644 --- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SweepCommand.java +++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SweepCommand.java @@ -15,16 +15,6 @@ */ package com.palantir.atlasdb.cli.command; -import java.util.Arrays; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - -import javax.annotation.Nullable; - -import org.slf4j.LoggerFactory; - import com.google.common.base.Functions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -45,9 +35,15 @@ import com.palantir.common.base.Throwables; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; - import io.airlift.airline.Command; import io.airlift.airline.Option; +import java.util.Arrays; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; +import javax.annotation.Nullable; +import org.slf4j.LoggerFactory; @Command(name = "sweep", description = "Sweep old table rows") public class SweepCommand extends SingleBackendCommand { diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/AbstractTimestampCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/AbstractTimestampCommand.java index e886d4a5788..4f8491cd7e2 100644 --- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/AbstractTimestampCommand.java +++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/AbstractTimestampCommand.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.cli.command.timestamp; -import java.io.File; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.util.Set; - -import org.apache.commons.lang3.StringUtils; -import org.slf4j.LoggerFactory; - import com.google.common.base.Throwables; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; @@ -32,9 +23,15 @@ import com.palantir.atlasdb.services.AtlasDbServices; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; - import io.airlift.airline.Option; import io.airlift.airline.OptionType; +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.Set; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.LoggerFactory; public abstract class AbstractTimestampCommand extends SingleBackendCommand { diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/CleanTransactionRange.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/CleanTransactionRange.java index f2f65c597dd..79808fed324 100644 --- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/CleanTransactionRange.java +++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/CleanTransactionRange.java @@ -15,18 +15,15 @@ */ package com.palantir.atlasdb.cli.command.timestamp; -import java.util.OptionalLong; - -import org.slf4j.LoggerFactory; - import com.palantir.atlasdb.cli.output.OutputPrinter; import com.palantir.atlasdb.restore.V1TransactionsTableRangeDeleter; import com.palantir.atlasdb.services.AtlasDbServices; import com.palantir.timestamp.TimestampRange; - import io.airlift.airline.Command; import io.airlift.airline.Option; import io.airlift.airline.OptionType; +import java.util.OptionalLong; +import org.slf4j.LoggerFactory; @Command(name = "clean-transactions", description = "Clean out the entries in a _transactions table for the " + "purpose of deleting potentially inconsistent transactions from an underlying database that lacks " diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FastForwardTimestamp.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FastForwardTimestamp.java index 3cc229375c8..95a57b35319 100644 --- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FastForwardTimestamp.java +++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FastForwardTimestamp.java @@ -15,15 +15,13 @@ */ package com.palantir.atlasdb.cli.command.timestamp; -import org.slf4j.LoggerFactory; - import com.palantir.atlasdb.cli.output.OutputPrinter; import com.palantir.atlasdb.services.AtlasDbServices; import com.palantir.logsafe.SafeArg; import com.palantir.timestamp.TimestampManagementService; import com.palantir.timestamp.TimestampService; - import io.airlift.airline.Command; +import org.slf4j.LoggerFactory; @Command(name = "fast-forward", description = "Fast forward the stored upper limit of a persistent timestamp" + " service to the specified timestamp." diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FetchTimestamp.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FetchTimestamp.java index f465d06e106..5c0fa85974e 100644 --- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FetchTimestamp.java +++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FetchTimestamp.java @@ -15,18 +15,16 @@ */ package com.palantir.atlasdb.cli.command.timestamp; -import org.joda.time.DateTime; -import org.joda.time.format.ISODateTimeFormat; -import org.slf4j.LoggerFactory; - import com.palantir.atlasdb.cleaner.KeyValueServicePuncherStore; import com.palantir.atlasdb.cli.output.OutputPrinter; import com.palantir.atlasdb.services.AtlasDbServices; import com.palantir.logsafe.SafeArg; - import io.airlift.airline.Command; import io.airlift.airline.Option; import io.airlift.airline.OptionType; +import org.joda.time.DateTime; +import org.joda.time.format.ISODateTimeFormat; +import org.slf4j.LoggerFactory; @Command(name = "fetch", description = "Fetches a timestamp. By default" + " this will be a fresh timestamp unless otherwise specified.") diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/output/OutputPrinter.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/output/OutputPrinter.java index 12505791a82..67c64285392 100644 --- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/output/OutputPrinter.java +++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/output/OutputPrinter.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.cli.output; -import org.slf4j.Logger; -import org.slf4j.helpers.MessageFormatter; - import com.palantir.atlasdb.restore.OutputStateLogger; import com.palantir.logsafe.Arg; +import org.slf4j.Logger; +import org.slf4j.helpers.MessageFormatter; @SuppressWarnings("Slf4jConstantLogMessage") public class OutputPrinter implements OutputStateLogger { diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/KeyValueServiceMigratorsTest.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/KeyValueServiceMigratorsTest.java index 1c5baae767b..175b2592a6b 100644 --- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/KeyValueServiceMigratorsTest.java +++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/KeyValueServiceMigratorsTest.java @@ -28,11 +28,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.util.Map; - -import org.junit.Test; -import org.mockito.ArgumentCaptor; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -64,6 +59,9 @@ import com.palantir.timestamp.InMemoryTimestampService; import com.palantir.timestamp.TimestampManagementService; import com.palantir.timestamp.TimestampService; +import java.util.Map; +import org.junit.Test; +import org.mockito.ArgumentCaptor; public class KeyValueServiceMigratorsTest { diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestFastForwardTimestampCommand.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestFastForwardTimestampCommand.java index 719c1daa255..a8e470caa0e 100644 --- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestFastForwardTimestampCommand.java +++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestFastForwardTimestampCommand.java @@ -17,8 +17,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.palantir.atlasdb.cli.command.timestamp.FastForwardTimestamp; import com.palantir.atlasdb.cli.command.timestamp.FetchTimestamp; import com.palantir.atlasdb.cli.runner.InMemoryTestRunner; @@ -36,8 +34,8 @@ import com.palantir.lock.impl.LegacyTimelockService; import com.palantir.lock.impl.LockServiceImpl; import com.palantir.timestamp.InMemoryTimestampService; - import io.airlift.airline.Command; +import org.junit.Test; public class TestFastForwardTimestampCommand { private static final String TIMESTAMP_GROUP = "timestamp"; diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestKvsMigrationCommand.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestKvsMigrationCommand.java index 7a66b555517..ea212845b2f 100644 --- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestKvsMigrationCommand.java +++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestKvsMigrationCommand.java @@ -17,16 +17,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.net.URISyntaxException; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.Callable; - -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ObjectArrays; @@ -38,6 +28,14 @@ import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.services.AtlasDbServices; +import java.net.URISyntaxException; +import java.util.Map; +import java.util.Map.Entry; +import java.util.concurrent.Callable; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; public class TestKvsMigrationCommand { private AtlasDbServices fromServices; diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestScrubQueueMigrationCommand.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestScrubQueueMigrationCommand.java index c39db4def75..d0055248b6f 100644 --- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestScrubQueueMigrationCommand.java +++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestScrubQueueMigrationCommand.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.cli.command; -import java.io.ByteArrayOutputStream; -import java.io.PrintWriter; -import java.util.SortedMap; - -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Iterables; @@ -40,6 +31,13 @@ import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; import com.palantir.common.base.BatchingVisitable; import com.palantir.common.base.BatchingVisitables; +import java.io.ByteArrayOutputStream; +import java.io.PrintWriter; +import java.util.SortedMap; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; public class TestScrubQueueMigrationCommand { private KeyValueService kvs; diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSingleBackendCommand.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSingleBackendCommand.java index 34ad341efec..48cb02a60ab 100644 --- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSingleBackendCommand.java +++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSingleBackendCommand.java @@ -15,25 +15,22 @@ */ package com.palantir.atlasdb.cli.command; -import java.net.URISyntaxException; -import java.nio.file.Paths; -import java.util.Arrays; -import java.util.concurrent.Callable; - -import org.junit.BeforeClass; -import org.junit.Test; - import com.google.common.base.Preconditions; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.cli.runner.AbstractTestRunner; import com.palantir.atlasdb.cli.runner.InMemoryTestRunner; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.services.AtlasDbServices; - import io.airlift.airline.Cli; import io.airlift.airline.Command; import io.airlift.airline.Help; import io.airlift.airline.Option; +import java.net.URISyntaxException; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.concurrent.Callable; +import org.junit.BeforeClass; +import org.junit.Test; public class TestSingleBackendCommand { diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSweepCommand.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSweepCommand.java index 95c586aeab3..05bbc889e40 100644 --- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSweepCommand.java +++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSweepCommand.java @@ -15,21 +15,6 @@ */ package com.palantir.atlasdb.cli.command; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Scanner; -import java.util.Set; -import java.util.concurrent.atomic.AtomicLong; - -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.io.BaseEncoding; @@ -51,8 +36,20 @@ import com.palantir.atlasdb.transaction.api.ConflictHandler; import com.palantir.atlasdb.transaction.impl.SerializableTransactionManager; import com.palantir.timestamp.TimestampService; - import io.airlift.airline.Command; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Scanner; +import java.util.Set; +import java.util.concurrent.atomic.AtomicLong; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; @RunWith(Parameterized.class) public class TestSweepCommand { diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestTimestampCommand.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestTimestampCommand.java index b703420348e..5ea8172c8bd 100644 --- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestTimestampCommand.java +++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestTimestampCommand.java @@ -18,26 +18,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import java.io.File; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.AccessDeniedException; -import java.nio.file.Files; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Scanner; -import java.util.concurrent.TimeUnit; - -import org.apache.commons.io.FileUtils; -import org.joda.time.format.ISODateTimeFormat; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Lists; @@ -64,6 +44,24 @@ import com.palantir.lock.LockService; import com.palantir.lock.StringLockDescriptor; import com.palantir.timestamp.TimestampService; +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.AccessDeniedException; +import java.nio.file.Files; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Scanner; +import java.util.concurrent.TimeUnit; +import org.apache.commons.io.FileUtils; +import org.joda.time.format.ISODateTimeFormat; +import org.junit.After; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; @RunWith(Parameterized.class) public class TestTimestampCommand { diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/output/OutputPrinterTest.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/output/OutputPrinterTest.java index f4206d8dddb..04cfa852015 100644 --- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/output/OutputPrinterTest.java +++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/output/OutputPrinterTest.java @@ -17,12 +17,11 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; -import org.slf4j.LoggerFactory; - import com.palantir.atlasdb.cli.runner.StandardStreamUtilities; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; +import org.junit.Test; +import org.slf4j.LoggerFactory; public class OutputPrinterTest { private static final OutputPrinter print = new OutputPrinter(LoggerFactory.getLogger(OutputPrinter.class)); diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/AbstractTestRunner.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/AbstractTestRunner.java index bdf188141c2..507335c7384 100644 --- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/AbstractTestRunner.java +++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/AbstractTestRunner.java @@ -15,19 +15,17 @@ */ package com.palantir.atlasdb.cli.runner; -import java.net.URISyntaxException; -import java.nio.file.Paths; -import java.util.Arrays; -import java.util.concurrent.Callable; - -import org.apache.commons.lang3.ArrayUtils; - import com.palantir.atlasdb.cli.AtlasCli; import com.palantir.atlasdb.cli.command.SingleBackendCommand; import com.palantir.atlasdb.services.AtlasDbServices; import com.palantir.atlasdb.services.AtlasDbServicesFactory; import com.palantir.atlasdb.spi.KeyValueServiceConfig; import com.palantir.logsafe.exceptions.SafeRuntimeException; +import java.net.URISyntaxException; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.concurrent.Callable; +import org.apache.commons.lang3.ArrayUtils; public abstract class AbstractTestRunner implements SingleBackendCliTestRunner { diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/SingleBackendCliTestRunner.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/SingleBackendCliTestRunner.java index 87310df444b..a52c1e89a6b 100644 --- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/SingleBackendCliTestRunner.java +++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/SingleBackendCliTestRunner.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.cli.runner; -import java.net.URISyntaxException; - import com.palantir.atlasdb.services.AtlasDbServices; import com.palantir.atlasdb.services.AtlasDbServicesFactory; +import java.net.URISyntaxException; public interface SingleBackendCliTestRunner extends AutoCloseable { diff --git a/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/test/StringValue.java b/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/test/StringValue.java index ab182f0f565..760f81ea530 100644 --- a/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/test/StringValue.java +++ b/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/test/StringValue.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.table.description.test; -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.immutables.value.Value; @Value.Immutable @JsonSerialize(as=ImmutableStringValue.class) diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/AtlasDbConstants.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/AtlasDbConstants.java index b63930be031..86e34c7876b 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/AtlasDbConstants.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/AtlasDbConstants.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb; -import java.util.Set; - import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.TableReference; @@ -25,6 +23,7 @@ import com.palantir.atlasdb.spi.AtlasDbFactory; import com.palantir.atlasdb.table.description.TableMetadata; import com.palantir.atlasdb.transaction.impl.TransactionConstants; +import java.util.Set; public final class AtlasDbConstants { private AtlasDbConstants() { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/DefaultTimestampCache.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/DefaultTimestampCache.java index 8d8b6a6b4f4..795ec3724c9 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/DefaultTimestampCache.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/DefaultTimestampCache.java @@ -15,16 +15,14 @@ */ package com.palantir.atlasdb.cache; -import java.util.function.Supplier; - -import javax.annotation.Nullable; - import com.codahale.metrics.MetricRegistry; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.Policy; import com.google.common.annotations.VisibleForTesting; import com.palantir.atlasdb.util.AtlasDbMetrics; +import java.util.function.Supplier; +import javax.annotation.Nullable; public class DefaultTimestampCache implements TimestampCache { private final Supplier size; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/compress/CompressionUtils.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/compress/CompressionUtils.java index 5d30f905271..031ce63aa8f 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/compress/CompressionUtils.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/compress/CompressionUtils.java @@ -15,13 +15,11 @@ */ package com.palantir.atlasdb.compress; -import java.io.IOException; - -import org.xerial.snappy.Snappy; - import com.palantir.atlasdb.table.description.ColumnValueDescription.Compression; import com.palantir.common.base.Throwables; import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; +import java.io.IOException; +import org.xerial.snappy.Snappy; public final class CompressionUtils { private CompressionUtils() { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/health/MetricsBasedTimelockHealthCheck.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/health/MetricsBasedTimelockHealthCheck.java index 068af0bf267..94f75e9f235 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/health/MetricsBasedTimelockHealthCheck.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/health/MetricsBasedTimelockHealthCheck.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.health; -import java.util.Map; - import com.codahale.metrics.Meter; import com.codahale.metrics.MetricRegistry; import com.palantir.atlasdb.AtlasDbMetricNames; import com.palantir.atlasdb.transaction.api.TimelockServiceStatus; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.util.Map; public class MetricsBasedTimelockHealthCheck implements TimelockHealthCheck{ private final MetricRegistry metricRegistry; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/api/StoredWriteReference.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/api/StoredWriteReference.java index 08995308d98..ef65bc1252a 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/api/StoredWriteReference.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/api/StoredWriteReference.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.api; -import org.immutables.value.Value.Immutable; -import org.immutables.value.Value.Parameter; - import com.palantir.common.persist.Persistable; import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; +import org.immutables.value.Value.Immutable; +import org.immutables.value.Value.Parameter; @Immutable public interface StoredWriteReference extends Persistable { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/api/WriteReference.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/api/WriteReference.java index 960395186ec..57a6ac388d7 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/api/WriteReference.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/api/WriteReference.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.api; -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.immutables.value.Value; @JsonDeserialize(as = ImmutableWriteReference.class) @JsonSerialize(as = ImmutableWriteReference.class) diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueService.java index d6aa112709c..3e2b60ca800 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueService.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueService.java @@ -15,16 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.impl; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; - import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -48,8 +38,16 @@ import com.palantir.common.base.ClosableIterator; import com.palantir.common.concurrent.NamedThreadFactory; import com.palantir.common.concurrent.PTExecutors; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; @SuppressFBWarnings("SLF4J_ILLEGAL_PASSED_CLASS") public abstract class AbstractKeyValueService implements KeyValueService { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/Cells.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/Cells.java index 8b63bc1b015..f0c8451297a 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/Cells.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/Cells.java @@ -15,21 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.impl; -import java.util.Arrays; -import java.util.Collection; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; -import java.util.NavigableMap; -import java.util.Set; -import java.util.SortedMap; -import java.util.SortedSet; - -import javax.annotation.Nullable; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.collect.AbstractIterator; @@ -52,6 +37,18 @@ import com.palantir.atlasdb.transaction.api.TransactionConflictException.CellConflict; import com.palantir.atlasdb.transaction.impl.TransactionConstants; import com.palantir.common.annotation.Output; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; +import java.util.NavigableMap; +import java.util.Set; +import java.util.SortedMap; +import java.util.SortedSet; +import javax.annotation.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class Cells { private static final Logger log = LoggerFactory.getLogger(Cells.class); diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/CheckAndSetResult.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/CheckAndSetResult.java index 68c72168674..d153cdb64fb 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/CheckAndSetResult.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/CheckAndSetResult.java @@ -17,7 +17,6 @@ package com.palantir.atlasdb.keyvalue.impl; import java.util.List; - import org.immutables.value.Value; @Value.Immutable diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueService.java index 1f89ed3c5bb..a11f3c336c6 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueService.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueService.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.impl; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Multimap; import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection; @@ -41,6 +36,10 @@ import com.palantir.atlasdb.keyvalue.api.Value; import com.palantir.common.base.ClosableIterator; import com.palantir.util.paging.TokenBackedBasicResultsPage; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * An implementation of KeyValueService which delegates reads to the first KeyValueService and diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ForwardingKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ForwardingKeyValueService.java index f5e8451c8b9..502fdfa539a 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ForwardingKeyValueService.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ForwardingKeyValueService.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.impl; -import java.util.Collection; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.keyvalue.api.AutoDelegate_KeyValueService; import com.palantir.atlasdb.keyvalue.api.KeyValueService; +import java.util.Collection; public abstract class ForwardingKeyValueService implements AutoDelegate_KeyValueService { @Override diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/GetCandidateCellsForSweepingShim.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/GetCandidateCellsForSweepingShim.java index 516c2bffedf..cac87b735ed 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/GetCandidateCellsForSweepingShim.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/GetCandidateCellsForSweepingShim.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.impl; -import java.io.Closeable; -import java.io.IOException; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - import com.google.common.collect.Iterators; import com.google.common.collect.Lists; import com.google.common.collect.PeekingIterator; @@ -40,6 +32,13 @@ import com.palantir.atlasdb.keyvalue.api.Value; import com.palantir.common.base.ClosableIterator; import com.palantir.common.base.ClosableIterators; +import java.io.Closeable; +import java.io.IOException; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; // This class provides a temporary implementation of the new call using existing KVS calls, // so that we can make this change in several smaller commits. diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/InMemoryKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/InMemoryKeyValueService.java index 6ea468eb6d8..00ace59b484 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/InMemoryKeyValueService.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/InMemoryKeyValueService.java @@ -15,27 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.impl; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Optional; -import java.util.Set; -import java.util.SortedMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ConcurrentNavigableMap; -import java.util.concurrent.ConcurrentSkipListMap; -import java.util.concurrent.ExecutorService; - -import javax.annotation.Nullable; -import javax.annotation.concurrent.ThreadSafe; - -import org.apache.commons.lang3.ArrayUtils; - import com.google.common.collect.AbstractIterator; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; @@ -73,6 +52,24 @@ import com.palantir.common.base.ClosableIterator; import com.palantir.common.base.ClosableIterators; import com.palantir.util.paging.TokenBackedBasicResultsPage; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; +import java.util.Set; +import java.util.SortedMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ConcurrentNavigableMap; +import java.util.concurrent.ConcurrentSkipListMap; +import java.util.concurrent.ExecutorService; +import javax.annotation.Nullable; +import javax.annotation.concurrent.ThreadSafe; +import org.apache.commons.lang3.ArrayUtils; /** * In-memory (non-durable) key-value store implementation. diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/IterablePartitioner.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/IterablePartitioner.java index f59f533d6f5..cc5778a6cfa 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/IterablePartitioner.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/IterablePartitioner.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.impl; -import java.util.List; -import java.util.NoSuchElementException; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; import com.google.common.collect.Iterables; @@ -33,6 +27,10 @@ import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; +import java.util.List; +import java.util.NoSuchElementException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class IterablePartitioner { private static final Logger defaultLogger = LoggerFactory.getLogger(KeyValueService.class); diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/KeyValueServices.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/KeyValueServices.java index d097f604561..47af01aba66 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/KeyValueServices.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/KeyValueServices.java @@ -15,19 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.impl; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; -import java.util.concurrent.ExecutorService; - -import org.apache.commons.lang3.tuple.Pair; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSortedMap; @@ -54,6 +41,17 @@ import com.palantir.util.crypto.Sha256Hash; import com.palantir.util.paging.SimpleTokenBackedResultsPage; import com.palantir.util.paging.TokenBackedBasicResultsPage; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.concurrent.ExecutorService; +import org.apache.commons.lang3.tuple.Pair; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class KeyValueServices { private static final Logger log = LoggerFactory.getLogger(KeyValueServices.class); diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/LocalRowColumnRangeIterator.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/LocalRowColumnRangeIterator.java index 1266c070d23..817c85b73b4 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/LocalRowColumnRangeIterator.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/LocalRowColumnRangeIterator.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.keyvalue.impl; -import java.util.Iterator; -import java.util.Map; - import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator; import com.palantir.atlasdb.keyvalue.api.Value; +import java.util.Iterator; +import java.util.Map; public class LocalRowColumnRangeIterator implements RowColumnRangeIterator { private final Iterator> it; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueService.java index 5da2a84dc95..71717ad897e 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueService.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueService.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.impl; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.function.BiConsumer; -import java.util.function.Supplier; - import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; @@ -51,6 +43,13 @@ import com.palantir.atlasdb.logging.LoggingArgs; import com.palantir.common.base.ClosableIterator; import com.palantir.util.paging.TokenBackedBasicResultsPage; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.function.BiConsumer; +import java.util.function.Supplier; public final class ProfilingKeyValueService implements KeyValueService { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/RowResults.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/RowResults.java index bbdfa585a3b..b63d6ce2bfe 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/RowResults.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/RowResults.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.impl; -import java.util.Arrays; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; -import java.util.SortedMap; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSortedMap; @@ -32,6 +26,11 @@ import com.palantir.atlasdb.keyvalue.api.RowResult; import com.palantir.common.collect.IterableView; import com.palantir.logsafe.Preconditions; +import java.util.Arrays; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; +import java.util.SortedMap; public class RowResults { private RowResults() { /* */ } diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/StatsTrackingKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/StatsTrackingKeyValueService.java index ee2eac35fd0..020ef882002 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/StatsTrackingKeyValueService.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/StatsTrackingKeyValueService.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.impl; -import java.io.PrintWriter; -import java.util.Collections; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicLong; - -import javax.annotation.concurrent.ThreadSafe; - import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; @@ -39,6 +30,13 @@ import com.palantir.common.base.ClosableIterator; import com.palantir.common.base.ForwardingClosableIterator; import com.palantir.common.collect.MapEntries; +import java.io.PrintWriter; +import java.util.Collections; +import java.util.Map; +import java.util.Map.Entry; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicLong; +import javax.annotation.concurrent.ThreadSafe; @ThreadSafe @SuppressWarnings("checkstyle:all") // too many warnings to fix diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/SweepStatsKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/SweepStatsKeyValueService.java index 205c5d69d90..183373ff8e5 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/SweepStatsKeyValueService.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/SweepStatsKeyValueService.java @@ -15,22 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.impl; -import java.util.Collection; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Functions; import com.google.common.collect.Collections2; @@ -60,6 +44,20 @@ import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; import com.palantir.timestamp.TimestampService; +import java.util.Collection; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This kvs wrapper tracks the approximate number of writes to every table diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingKeyValueService.java index 894a5046bf9..aea3c2f9bac 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingKeyValueService.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingKeyValueService.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.impl; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.google.common.collect.ForwardingObject; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; @@ -47,6 +42,10 @@ import com.palantir.common.base.ClosableIterator; import com.palantir.logsafe.Preconditions; import com.palantir.util.paging.TokenBackedBasicResultsPage; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * Wraps a {@link KeyValueService}'s methods with {@link com.palantir.tracing.Tracer} @@ -416,4 +415,3 @@ public boolean shouldTriggerCompactions() { return delegate().shouldTriggerCompactions(); } } - diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingPrefsConfig.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingPrefsConfig.java index 8303fa2f2bf..6fac7b2d26d 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingPrefsConfig.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingPrefsConfig.java @@ -15,19 +15,17 @@ */ package com.palantir.atlasdb.keyvalue.impl; +import com.google.common.base.Splitter; +import com.google.common.collect.ImmutableSet; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.util.Properties; import java.util.Random; import java.util.Set; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Splitter; -import com.google.common.collect.ImmutableSet; - public class TracingPrefsConfig implements Runnable { private static final Logger log = LoggerFactory.getLogger(TracingPrefsConfig.class); private static final String TRACING_PREF_FILENAME = "atlas_tracing.prefs"; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ValidatingQueryRewritingKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ValidatingQueryRewritingKeyValueService.java index 49a91a99829..a0ca1852888 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ValidatingQueryRewritingKeyValueService.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ValidatingQueryRewritingKeyValueService.java @@ -15,16 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.impl; -import java.util.Arrays; -import java.util.Collection; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import org.apache.commons.lang3.Validate; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSetMultimap; @@ -45,6 +35,14 @@ import com.palantir.atlasdb.transaction.impl.TransactionConstants; import com.palantir.logsafe.Preconditions; import com.palantir.util.paging.TokenBackedBasicResultsPage; +import java.util.Arrays; +import java.util.Collection; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import org.apache.commons.lang3.Validate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This wrapper KVS should ensure that we're consistent across KVSs with: diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/KvsProfilingLogger.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/KvsProfilingLogger.java index 8ab3443a4d8..621b486421d 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/KvsProfilingLogger.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/KvsProfilingLogger.java @@ -15,6 +15,9 @@ */ package com.palantir.atlasdb.logging; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Lists; import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; @@ -22,14 +25,9 @@ import java.util.function.Consumer; import java.util.function.Predicate; import java.util.function.Supplier; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Stopwatch; -import com.google.common.collect.Lists; - public class KvsProfilingLogger { public static final String SLOW_LOGGER_NAME = "kvs-slow-log-2"; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/LoggingArgs.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/LoggingArgs.java index b629fe8a0a8..3bf97e0c7c1 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/LoggingArgs.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/LoggingArgs.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.logging; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import org.immutables.value.Value; - import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Stopwatch; import com.google.common.collect.Collections2; @@ -37,6 +29,12 @@ import com.palantir.logsafe.Arg; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import org.immutables.value.Value; /** * Includes utilities for generating logging args that may be safe or unsafe, depending on table metadata. diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/SafeLoggableData.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/SafeLoggableData.java index 808988a1d8e..f1d3d853f94 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/SafeLoggableData.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/SafeLoggableData.java @@ -15,15 +15,13 @@ */ package com.palantir.atlasdb.logging; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.keyvalue.impl.AbstractKeyValueService; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; - import org.immutables.value.Value; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.atlasdb.keyvalue.impl.AbstractKeyValueService; - @Value.Immutable public abstract class SafeLoggableData implements KeyValueServiceLogArbitrator { public abstract Set permittedTableReferences(); diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/SafeLoggableDataUtils.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/SafeLoggableDataUtils.java index 2bd05d3cdbb..dc6f3c529f6 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/SafeLoggableDataUtils.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/SafeLoggableDataUtils.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.logging; -import java.util.Map; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.TableReference; @@ -31,6 +23,12 @@ import com.palantir.atlasdb.table.description.NamedColumnDescription; import com.palantir.atlasdb.table.description.TableMetadata; import com.palantir.logsafe.UnsafeArg; +import java.util.Map; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class SafeLoggableDataUtils { private static final Logger log = LoggerFactory.getLogger(SafeLoggableDataUtils.class); diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/persister/JacksonPersister.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/persister/JacksonPersister.java index 3f9b2a9a82d..469bacb8f6a 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/persister/JacksonPersister.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/persister/JacksonPersister.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.persister; -import java.io.IOException; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; import com.palantir.atlasdb.persist.api.Persister; +import java.io.IOException; /** * A {@link Persister} that uses an {@link ObjectMapper} to serialize and deserialize objects diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/persister/JsonNodePersister.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/persister/JsonNodePersister.java index 7445f087517..cdc72b0bb7a 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/persister/JsonNodePersister.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/persister/JsonNodePersister.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.persister; -import java.io.IOException; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.palantir.atlasdb.persist.api.Persister; import com.palantir.common.base.Throwables; +import java.io.IOException; public class JsonNodePersister implements Persister { static final ObjectMapper mapper = new ObjectMapper(); diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/ptobject/EncodingUtils.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/ptobject/EncodingUtils.java index 73170c459e7..2b8bbb11944 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/ptobject/EncodingUtils.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/ptobject/EncodingUtils.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.ptobject; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; - -import org.apache.commons.lang3.ArrayUtils; - import com.google.common.collect.Lists; import com.google.common.primitives.Bytes; import com.google.common.primitives.Longs; @@ -33,6 +25,12 @@ import com.palantir.common.annotation.Output; import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; +import org.apache.commons.lang3.ArrayUtils; @SuppressWarnings("checkstyle:all") // too many warnings to fix public class EncodingUtils { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/AbstractTaskCheckpointer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/AbstractTaskCheckpointer.java index ec041bd69dc..53fadfd10bf 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/AbstractTaskCheckpointer.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/AbstractTaskCheckpointer.java @@ -15,12 +15,10 @@ */ package com.palantir.atlasdb.schema; -import java.util.Map; - -import javax.annotation.Nullable; - import com.palantir.atlasdb.transaction.api.Transaction; import com.palantir.atlasdb.transaction.api.TransactionManager; +import java.util.Map; +import javax.annotation.Nullable; public abstract class AbstractTaskCheckpointer { private static final byte INCOMPLETE = 0; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/CompactSchema.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/CompactSchema.java index 36f338b7b13..289a77c0864 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/CompactSchema.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/CompactSchema.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.schema; -import java.io.File; -import java.util.function.Supplier; - import com.google.common.base.Suppliers; import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.table.description.OptionalType; @@ -25,6 +22,8 @@ import com.palantir.atlasdb.table.description.TableDefinition; import com.palantir.atlasdb.table.description.ValueType; import com.palantir.atlasdb.transaction.api.ConflictHandler; +import java.io.File; +import java.util.function.Supplier; public enum CompactSchema implements AtlasSchema { INSTANCE; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/GeneralTaskCheckpointer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/GeneralTaskCheckpointer.java index 7624d6aeb6c..9b37f84d600 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/GeneralTaskCheckpointer.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/GeneralTaskCheckpointer.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.schema; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -41,6 +36,10 @@ import com.palantir.atlasdb.transaction.api.Transaction; import com.palantir.atlasdb.transaction.api.TransactionManager; import com.palantir.atlasdb.transaction.api.TransactionTask; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; /** * This checkpointer creates a temporary table for checkpointing. diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/KvsRangeMigrator.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/KvsRangeMigrator.java index c2a3fe84f15..789d1bf8960 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/KvsRangeMigrator.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/KvsRangeMigrator.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.schema; -import java.util.Map; - -import org.apache.commons.lang3.mutable.MutableLong; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Function; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; @@ -45,6 +39,10 @@ import com.palantir.common.collect.Maps2; import com.palantir.util.Mutable; import com.palantir.util.Mutables; +import java.util.Map; +import org.apache.commons.lang3.mutable.MutableLong; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class KvsRangeMigrator implements RangeMigrator { private static final Logger log = LoggerFactory.getLogger(KvsRangeMigrator.class); diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/KvsRangeMigratorBuilder.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/KvsRangeMigratorBuilder.java index 8fcabae9c09..5a396d5bedb 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/KvsRangeMigratorBuilder.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/KvsRangeMigratorBuilder.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.schema; -import java.util.Map; - import com.google.common.base.Function; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.KeyValueService; @@ -25,6 +23,7 @@ import com.palantir.atlasdb.transaction.api.TransactionManager; import com.palantir.common.collect.Maps2; import com.palantir.logsafe.Preconditions; +import java.util.Map; /** * Builder for a {@link KvsRangeMigrator}. diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/SweepSchema.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/SweepSchema.java index 4ef49789962..37d0cb0bdae 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/SweepSchema.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/SweepSchema.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.schema; -import java.io.File; -import java.util.function.Supplier; - import com.google.common.base.Suppliers; import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.table.description.OptionalType; @@ -25,6 +22,8 @@ import com.palantir.atlasdb.table.description.TableDefinition; import com.palantir.atlasdb.table.description.ValueType; import com.palantir.atlasdb.transaction.api.ConflictHandler; +import java.io.File; +import java.util.function.Supplier; public enum SweepSchema implements AtlasSchema { INSTANCE; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TableMigrator.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TableMigrator.java index 1a9d373e3e0..e36f8066ea3 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TableMigrator.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TableMigrator.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.schema; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; @@ -38,6 +30,13 @@ import com.palantir.common.base.Throwables; import com.palantir.common.concurrent.PTExecutors; import com.palantir.logsafe.Preconditions; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; public class TableMigrator { private final TableReference srcTable; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TableMigratorBuilder.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TableMigratorBuilder.java index eea87ca200c..a68f89e8fd6 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TableMigratorBuilder.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TableMigratorBuilder.java @@ -15,14 +15,13 @@ */ package com.palantir.atlasdb.schema; -import java.util.List; -import java.util.concurrent.ExecutorService; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.keyvalue.api.ColumnSelection; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.table.description.RowNamePartitioner; import com.palantir.logsafe.Preconditions; +import java.util.List; +import java.util.concurrent.ExecutorService; /** * Builder for a {@link TableMigrator}. diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TargetedSweepSchema.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TargetedSweepSchema.java index c47f11bff56..d545093edee 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TargetedSweepSchema.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TargetedSweepSchema.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.schema; -import java.io.File; -import java.util.function.Supplier; - import com.google.common.base.Suppliers; import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.keyvalue.api.StoredWriteReference; @@ -29,6 +26,8 @@ import com.palantir.atlasdb.table.description.TableDefinition; import com.palantir.atlasdb.table.description.ValueType; import com.palantir.atlasdb.transaction.api.ConflictHandler; +import java.io.File; +import java.util.function.Supplier; public enum TargetedSweepSchema implements AtlasSchema { INSTANCE; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TransactionRangeMigrator.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TransactionRangeMigrator.java index 37155d60c54..9698cbdaa9a 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TransactionRangeMigrator.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TransactionRangeMigrator.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.schema; -import java.util.Map; - -import org.apache.commons.lang3.mutable.MutableLong; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Function; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.Cell; @@ -38,6 +32,10 @@ import com.palantir.common.base.BatchingVisitable; import com.palantir.util.Mutable; import com.palantir.util.Mutables; +import java.util.Map; +import org.apache.commons.lang3.mutable.MutableLong; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TransactionRangeMigrator implements RangeMigrator { private static final Logger log = LoggerFactory.getLogger(TransactionRangeMigrator.class); diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TransactionRangeMigratorBuilder.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TransactionRangeMigratorBuilder.java index ab897fb40cc..e9c1041dc8f 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TransactionRangeMigratorBuilder.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TransactionRangeMigratorBuilder.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.schema; -import java.util.Map; - import com.google.common.base.Function; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.RowResult; @@ -24,6 +22,7 @@ import com.palantir.atlasdb.transaction.api.TransactionManager; import com.palantir.common.collect.Maps2; import com.palantir.logsafe.Preconditions; +import java.util.Map; /** * Builder for a {@link TransactionRangeMigrator}. diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/Select1Long.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/Select1Long.java index 426b93d3511..fc1ebaa2493 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/Select1Long.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/Select1Long.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.schema.constraints.foreign; -import java.util.List; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.table.description.constraints.ForeignKeyConstraint; import com.palantir.atlasdb.table.description.constraints.tuples.TupleOf1; +import java.util.List; public class Select1Long implements ForeignKeyConstraint { public static List> getKeys(Long param) { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/Select2Long.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/Select2Long.java index 33b7cb6c8ba..7281392ae11 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/Select2Long.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/Select2Long.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.schema.constraints.foreign; -import java.util.List; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.table.description.constraints.ForeignKeyConstraint; import com.palantir.atlasdb.table.description.constraints.tuples.TupleOf2; +import java.util.List; public class Select2Long implements ForeignKeyConstraint { public static List> getKeys(Long param, Long param2) { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/SelectDynamicColumnLong.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/SelectDynamicColumnLong.java index ed470803ed8..b0f6f927c19 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/SelectDynamicColumnLong.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/SelectDynamicColumnLong.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.schema.constraints.foreign; -import java.util.List; - import com.google.common.collect.Lists; import com.palantir.atlasdb.table.description.constraints.ForeignKeyConstraint; import com.palantir.atlasdb.table.description.constraints.tuples.TupleOf1; +import java.util.List; public class SelectDynamicColumnLong implements ForeignKeyConstraint { public static List> getKeys(List longs) { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinition.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinition.java index 37d0957af5a..639a3a4127f 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinition.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinition.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.schema.stream; -import java.util.Map; -import java.util.function.Supplier; - import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import com.palantir.atlasdb.cleaner.api.OnCleanupTask; @@ -27,6 +24,8 @@ import com.palantir.atlasdb.table.description.render.Renderers; import com.palantir.atlasdb.table.description.render.StreamStoreRenderer; import com.palantir.common.base.Throwables; +import java.util.Map; +import java.util.function.Supplier; public class StreamStoreDefinition { // from ArrayList.MAX_ARRAY_SIZE on 64-bit systems diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinitionBuilder.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinitionBuilder.java index 636eeec1374..05a8f48380a 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinitionBuilder.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinitionBuilder.java @@ -15,15 +15,14 @@ */ package com.palantir.atlasdb.schema.stream; -import java.util.Map; -import java.util.stream.Collectors; - import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.atlasdb.table.description.TableDefinition; import com.palantir.atlasdb.table.description.ValueType; +import java.util.Map; +import java.util.stream.Collectors; public class StreamStoreDefinitionBuilder { private final ValueType valueType; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/AbstractGenericStreamStore.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/AbstractGenericStreamStore.java index 29e5e5eb53b..28d47f0a6e2 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/AbstractGenericStreamStore.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/AbstractGenericStreamStore.java @@ -15,6 +15,18 @@ */ package com.palantir.atlasdb.stream; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.google.common.collect.Maps; +import com.google.common.primitives.Ints; +import com.google.protobuf.ByteString; +import com.palantir.atlasdb.protos.generated.StreamPersistence.Status; +import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata; +import com.palantir.atlasdb.transaction.api.Transaction; +import com.palantir.atlasdb.transaction.api.TransactionManager; +import com.palantir.common.base.Throwables; +import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; +import com.palantir.util.ByteArrayIOStream; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileNotFoundException; @@ -26,25 +38,10 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; - import javax.annotation.CheckForNull; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.google.common.collect.Maps; -import com.google.common.primitives.Ints; -import com.google.protobuf.ByteString; -import com.palantir.atlasdb.protos.generated.StreamPersistence.Status; -import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata; -import com.palantir.atlasdb.transaction.api.Transaction; -import com.palantir.atlasdb.transaction.api.TransactionManager; -import com.palantir.common.base.Throwables; -import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; -import com.palantir.util.ByteArrayIOStream; - public abstract class AbstractGenericStreamStore implements GenericStreamStore { protected static final Logger log = LoggerFactory.getLogger(AbstractGenericStreamStore.class); diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/AbstractPersistentStreamStore.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/AbstractPersistentStreamStore.java index 233434a8fe7..d9bc55165c8 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/AbstractPersistentStreamStore.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/AbstractPersistentStreamStore.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.stream; -import java.io.IOException; -import java.io.InputStream; -import java.security.DigestInputStream; -import java.security.MessageDigest; -import java.util.Map; -import java.util.function.Supplier; - -import javax.annotation.Nullable; - import com.google.common.base.Functions; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; @@ -43,6 +34,13 @@ import com.palantir.common.base.Throwables; import com.palantir.util.Pair; import com.palantir.util.crypto.Sha256Hash; +import java.io.IOException; +import java.io.InputStream; +import java.security.DigestInputStream; +import java.security.MessageDigest; +import java.util.Map; +import java.util.function.Supplier; +import javax.annotation.Nullable; public abstract class AbstractPersistentStreamStore extends AbstractGenericStreamStore implements PersistentStreamStore { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/BlockConsumingInputStream.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/BlockConsumingInputStream.java index ab04b84c355..ffe9e6659a8 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/BlockConsumingInputStream.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/BlockConsumingInputStream.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.stream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; - import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.palantir.atlasdb.schema.stream.StreamStoreDefinition; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; public final class BlockConsumingInputStream extends InputStream { private final BlockGetter blockGetter; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/GenericStreamStore.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/GenericStreamStore.java index 99a8bb79d25..1c729a80436 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/GenericStreamStore.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/GenericStreamStore.java @@ -15,15 +15,14 @@ */ package com.palantir.atlasdb.stream; +import com.palantir.atlasdb.transaction.api.Transaction; +import com.palantir.util.crypto.Sha256Hash; import java.io.File; import java.io.InputStream; import java.util.Map; import java.util.Optional; import java.util.Set; -import com.palantir.atlasdb.transaction.api.Transaction; -import com.palantir.util.crypto.Sha256Hash; - /** * Interface for storing streams specifically for atlasdb. */ diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/PersistentStreamStore.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/PersistentStreamStore.java index 4c01b644f98..1158778a8ac 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/PersistentStreamStore.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/PersistentStreamStore.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.stream; -import java.io.InputStream; -import java.util.Map; - import com.palantir.atlasdb.transaction.api.Transaction; import com.palantir.util.Pair; import com.palantir.util.crypto.Sha256Hash; +import java.io.InputStream; +import java.util.Map; /** * Interface for storing streams specifically for atlasdb. diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/StandardPeriodicBackoffStrategy.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/StandardPeriodicBackoffStrategy.java index 12f9e73c86b..696838d4030 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/StandardPeriodicBackoffStrategy.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/StandardPeriodicBackoffStrategy.java @@ -15,14 +15,12 @@ */ package com.palantir.atlasdb.stream; +import com.google.common.annotations.VisibleForTesting; +import com.palantir.logsafe.SafeArg; import java.util.function.Supplier; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.annotations.VisibleForTesting; -import com.palantir.logsafe.SafeArg; - public class StandardPeriodicBackoffStrategy implements StreamStoreBackoffStrategy { private final Logger log = LoggerFactory.getLogger(StandardPeriodicBackoffStrategy.class); diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/StreamStorePersistenceConfiguration.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/StreamStorePersistenceConfiguration.java index 61890525fe2..aca20dd955d 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/StreamStorePersistenceConfiguration.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/StreamStorePersistenceConfiguration.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.stream; -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palantir.logsafe.Preconditions; +import org.immutables.value.Value; @JsonSerialize(as = ImmutableStreamStorePersistenceConfiguration.class) @JsonDeserialize(as = ImmutableStreamStorePersistenceConfiguration.class) diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIdentifier.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIdentifier.java index af17e351c9b..c3d9d6e32fd 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIdentifier.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIdentifier.java @@ -17,11 +17,10 @@ import static com.palantir.logsafe.Preconditions.checkState; -import org.immutables.value.Value; - import com.google.common.primitives.Ints; import com.palantir.atlasdb.ptobject.EncodingUtils; import com.palantir.common.persist.Persistable; +import org.immutables.value.Value; @Value.Immutable public interface SweepTableIdentifier extends Persistable { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbImmutableTable.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbImmutableTable.java index 78bb666ba07..bf76df1d4f6 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbImmutableTable.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbImmutableTable.java @@ -15,18 +15,15 @@ */ package com.palantir.atlasdb.table.api; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - import com.google.common.collect.Multimap; import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection; -import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection; import com.palantir.atlasdb.keyvalue.api.ColumnSelection; -import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.transaction.api.ConstraintCheckable; import com.palantir.common.base.BatchingVisitable; +import java.util.Iterator; +import java.util.List; +import java.util.Map; /* * Each AtlasDbTable should implement this interface. diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbNamedImmutableTable.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbNamedImmutableTable.java index 3a37c87cc55..34f83bd944e 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbNamedImmutableTable.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbNamedImmutableTable.java @@ -15,9 +15,8 @@ */ package com.palantir.atlasdb.table.api; -import java.util.List; - import com.palantir.atlasdb.keyvalue.api.ColumnSelection; +import java.util.List; /* * All named atlasdb tables should implement this interface. diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/AbstractDefinition.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/AbstractDefinition.java index 961f088b137..fcf529cdc17 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/AbstractDefinition.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/AbstractDefinition.java @@ -15,15 +15,14 @@ */ package com.palantir.atlasdb.table.description; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.ImmutableSet; import com.google.common.math.IntMath; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.CachePriority; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy; import com.palantir.atlasdb.transaction.api.ConflictHandler; import com.palantir.logsafe.Preconditions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; abstract class AbstractDefinition { private static final Logger log = LoggerFactory.getLogger(AbstractDefinition.class); @@ -122,4 +121,3 @@ void validateFirstRowComp(NameComponentDescription comp) { } } } - diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnMetadataDescription.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnMetadataDescription.java index 1fb064e7579..301490daa66 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnMetadataDescription.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnMetadataDescription.java @@ -15,17 +15,15 @@ */ package com.palantir.atlasdb.table.description; -import java.util.List; -import java.util.Set; - -import javax.annotation.concurrent.Immutable; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.ColumnMetadataDescription.Builder; import com.palantir.logsafe.Preconditions; +import java.util.List; +import java.util.Set; +import javax.annotation.concurrent.Immutable; @Immutable public class ColumnMetadataDescription { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnValueDescription.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnValueDescription.java index 5f8e5f9ad27..f623df1507e 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnValueDescription.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnValueDescription.java @@ -15,17 +15,6 @@ */ package com.palantir.atlasdb.table.description; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import javax.annotation.Nullable; -import javax.annotation.concurrent.Immutable; - -import org.apache.commons.lang3.Validate; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.protobuf.AbstractMessage; @@ -48,6 +37,14 @@ import com.palantir.common.persist.Persistables; import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import javax.annotation.Nullable; +import javax.annotation.concurrent.Immutable; +import org.apache.commons.lang3.Validate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Immutable @SuppressWarnings("checkstyle:all") // too many warnings to fix diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/DynamicColumnDescription.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/DynamicColumnDescription.java index 18700a4da56..9192fe0125b 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/DynamicColumnDescription.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/DynamicColumnDescription.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.table.description; -import javax.annotation.concurrent.Immutable; - import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.DynamicColumnDescription.Builder; +import javax.annotation.concurrent.Immutable; @Immutable public class DynamicColumnDescription { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ExplicitRowNamePartitioner.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ExplicitRowNamePartitioner.java index 76fc5d4fb24..2b933150138 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ExplicitRowNamePartitioner.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ExplicitRowNamePartitioner.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.table.description; -import java.util.Arrays; -import java.util.List; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.primitives.Bytes; +import java.util.Arrays; +import java.util.List; public class ExplicitRowNamePartitioner implements RowNamePartitioner { final ValueType valueType; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexDefinition.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexDefinition.java index e8db446a64b..43056af8297 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexDefinition.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexDefinition.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.table.description; -import java.util.List; -import java.util.Set; - import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; @@ -28,6 +25,8 @@ import com.palantir.atlasdb.table.description.render.Renderers; import com.palantir.atlasdb.transaction.api.ConflictHandler; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.util.List; +import java.util.Set; /** * Defines a secondary index for a schema. diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexMetadata.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexMetadata.java index 549c5832c98..00ba6bd127a 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexMetadata.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexMetadata.java @@ -15,10 +15,6 @@ */ package com.palantir.atlasdb.table.description; -import java.util.List; - -import javax.annotation.Nullable; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -28,6 +24,8 @@ import com.palantir.atlasdb.table.description.IndexDefinition.IndexType; import com.palantir.atlasdb.transaction.api.ConflictHandler; import com.palantir.logsafe.Preconditions; +import java.util.List; +import javax.annotation.Nullable; public class IndexMetadata { final String name; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NameComponentDescription.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NameComponentDescription.java index a5e0b1b96d0..36cd7b20b4d 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NameComponentDescription.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NameComponentDescription.java @@ -15,16 +15,14 @@ */ package com.palantir.atlasdb.table.description; -import java.util.Set; - -import javax.annotation.Nullable; -import javax.annotation.concurrent.Immutable; - import com.google.common.collect.Sets; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.LogSafety; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.ValueByteOrder; import com.palantir.logsafe.Preconditions; +import java.util.Set; +import javax.annotation.Nullable; +import javax.annotation.concurrent.Immutable; @Immutable public final class NameComponentDescription { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NameMetadataDescription.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NameMetadataDescription.java index b5b5588b744..0088bf504d3 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NameMetadataDescription.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NameMetadataDescription.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.table.description; -import java.util.Iterator; -import java.util.List; - -import javax.annotation.concurrent.Immutable; - -import org.json.simple.JSONObject; -import org.json.simple.parser.JSONParser; -import org.json.simple.parser.ParseException; - import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -36,6 +27,12 @@ import com.palantir.atlasdb.ptobject.EncodingUtils; import com.palantir.common.base.Throwables; import com.palantir.util.Pair; +import java.util.Iterator; +import java.util.List; +import javax.annotation.concurrent.Immutable; +import org.json.simple.JSONObject; +import org.json.simple.parser.JSONParser; +import org.json.simple.parser.ParseException; @Immutable public class NameMetadataDescription { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NamedColumnDescription.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NamedColumnDescription.java index 90d7bc7cf27..8a090f1cc3b 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NamedColumnDescription.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NamedColumnDescription.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.table.description; -import javax.annotation.concurrent.Immutable; - import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.LogSafety; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.NamedColumnDescription.Builder; +import javax.annotation.concurrent.Immutable; @Immutable public class NamedColumnDescription { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schema.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schema.java index 9caa89326f5..5173dbdcf9c 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schema.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schema.java @@ -17,22 +17,6 @@ import static java.util.stream.Collectors.toSet; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.function.Supplier; -import java.util.stream.Collectors; - -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Suppliers; @@ -57,6 +41,20 @@ import com.palantir.atlasdb.table.description.render.TableRenderer; import com.palantir.atlasdb.table.description.render.TableRendererV2; import com.palantir.atlasdb.transaction.api.ConflictHandler; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Defines a schema. diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schemas.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schemas.java index 3a1a894039f..36190cf81a9 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schemas.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schemas.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.table.description; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.stream.Collectors; - import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; @@ -27,6 +22,10 @@ import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.keyvalue.api.TableReference; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.stream.Collectors; public final class Schemas { private static final String INDEX_SUFFIX = "idx"; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/TableDefinition.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/TableDefinition.java index 764bb346dcf..cdc5831c14b 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/TableDefinition.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/TableDefinition.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.table.description; -import java.util.List; -import java.util.Set; - import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; @@ -36,6 +33,8 @@ import com.palantir.atlasdb.transaction.api.ConflictHandler; import com.palantir.common.persist.Persistable; import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; +import java.util.List; +import java.util.Set; /** * Defines a table for a schema. diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/TableMetadata.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/TableMetadata.java index 54b06a29ff4..a706d74d186 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/TableMetadata.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/TableMetadata.java @@ -15,10 +15,6 @@ */ package com.palantir.atlasdb.table.description; -import java.util.List; - -import org.immutables.value.Value; - import com.google.common.collect.ImmutableList; import com.google.protobuf.InvalidProtocolBufferException; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; @@ -28,6 +24,8 @@ import com.palantir.atlasdb.transaction.api.ConflictHandler; import com.palantir.common.base.Throwables; import com.palantir.common.persist.Persistable; +import java.util.List; +import org.immutables.value.Value; @Value.Immutable @Value.Style(get = {"get*", "is*", "has*"}) diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/UniformRowNamePartitioner.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/UniformRowNamePartitioner.java index 0fae5596e18..18483547bac 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/UniformRowNamePartitioner.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/UniformRowNamePartitioner.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.table.description; -import java.util.List; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.palantir.atlasdb.encoding.PtBytes; +import java.util.List; public class UniformRowNamePartitioner implements RowNamePartitioner { final ValueType valueType; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ValueType.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ValueType.java index 5ba2010b92f..52f1f2991af 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ValueType.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ValueType.java @@ -15,16 +15,14 @@ */ package com.palantir.atlasdb.table.description; -import java.util.UUID; - -import org.json.simple.JSONValue; - import com.google.common.base.Preconditions; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.atlasdb.ptobject.EncodingUtils; import com.palantir.util.Pair; import com.palantir.util.crypto.Sha256Hash; +import java.util.UUID; +import org.json.simple.JSONValue; public enum ValueType { /** diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/ConstraintMetadata.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/ConstraintMetadata.java index c2fb3518b51..2f052870db4 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/ConstraintMetadata.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/ConstraintMetadata.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.table.description.constraints; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; public final class ConstraintMetadata { private final List rowConstraints; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/ForeignKeyConstraintMetadata.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/ForeignKeyConstraintMetadata.java index a8f4309b0a5..607e2d867dd 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/ForeignKeyConstraintMetadata.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/ForeignKeyConstraintMetadata.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.table.description.constraints; -import java.util.Collections; -import java.util.List; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import java.util.Collections; +import java.util.List; public final class ForeignKeyConstraintMetadata { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/RowConstraintMetadata.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/RowConstraintMetadata.java index a9274342f80..9d889f7c8a5 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/RowConstraintMetadata.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/RowConstraintMetadata.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.table.description.constraints; -import java.util.Collections; -import java.util.List; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import java.util.Collections; +import java.util.List; public class RowConstraintMetadata { private final Class constraintClass; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/tuples/TupleOf4.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/tuples/TupleOf4.java index 35990e78f8d..82dd836a66c 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/tuples/TupleOf4.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/tuples/TupleOf4.java @@ -53,4 +53,3 @@ public int getSize() { } } - diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/ColumnRenderers.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/ColumnRenderers.java index 23de941f4a5..bc05572c8e2 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/ColumnRenderers.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/ColumnRenderers.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.table.description.render; -import java.util.SortedSet; - import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Ordering; import com.palantir.atlasdb.table.description.NamedColumnDescription; import com.palantir.atlasdb.table.description.TableMetadata; +import java.util.SortedSet; public final class ColumnRenderers { private ColumnRenderers() { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/ImportRenderer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/ImportRenderer.java index 81c961bcd21..2f01384ae62 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/ImportRenderer.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/ImportRenderer.java @@ -15,14 +15,13 @@ */ package com.palantir.atlasdb.table.description.render; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSortedSet; import java.util.Collection; import java.util.List; import java.util.SortedSet; import java.util.stream.Collectors; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSortedSet; - public class ImportRenderer extends Renderer { private static final List IMPORT_PREFIXES = ImmutableList.of("java.", "javax.", "org.", "com.", "net."); private final Collection> imports; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/NamedColumnRenderer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/NamedColumnRenderer.java index a205a7de4c4..fb2a2617c36 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/NamedColumnRenderer.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/NamedColumnRenderer.java @@ -15,9 +15,8 @@ */ package com.palantir.atlasdb.table.description.render; -import java.util.SortedSet; - import com.palantir.atlasdb.table.description.NamedColumnDescription; +import java.util.SortedSet; public class NamedColumnRenderer extends Renderer { private final String namedColumn; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/NamedRowResultRenderer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/NamedRowResultRenderer.java index 8109085db02..807e25bd6a7 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/NamedRowResultRenderer.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/NamedRowResultRenderer.java @@ -19,9 +19,8 @@ import static com.palantir.atlasdb.table.description.render.ColumnRenderers.VarName; import static com.palantir.atlasdb.table.description.render.ColumnRenderers.short_name; -import java.util.SortedSet; - import com.palantir.atlasdb.table.description.NamedColumnDescription; +import java.util.SortedSet; @SuppressWarnings("checkstyle:AvoidNestedBlocks") class NamedRowResultRenderer extends Renderer { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/Renderer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/Renderer.java index 325537bd0fa..0c07f3d6e25 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/Renderer.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/Renderer.java @@ -15,12 +15,10 @@ */ package com.palantir.atlasdb.table.description.render; -import java.util.concurrent.atomic.AtomicInteger; - -import javax.annotation.concurrent.NotThreadSafe; - import com.google.common.hash.Hashing; import com.palantir.logsafe.Preconditions; +import java.util.concurrent.atomic.AtomicInteger; +import javax.annotation.concurrent.NotThreadSafe; @NotThreadSafe public abstract class Renderer { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/Renderers.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/Renderers.java index 547ca085679..f8d31ff2548 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/Renderers.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/Renderers.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.table.description.render; -import java.util.List; -import java.util.stream.Collectors; - import com.palantir.atlasdb.table.description.IndexMetadata; import com.palantir.atlasdb.table.description.NameComponentDescription; import com.palantir.atlasdb.table.description.NameMetadataDescription; @@ -25,6 +22,8 @@ import com.palantir.atlasdb.table.description.TableDefinition; import com.palantir.atlasdb.table.description.TableMetadata; import com.squareup.javapoet.MethodSpec; +import java.util.List; +import java.util.stream.Collectors; public class Renderers { private Renderers() { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/RowOrDynamicColumnRenderer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/RowOrDynamicColumnRenderer.java index f51e4738090..ac90aad4348 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/RowOrDynamicColumnRenderer.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/RowOrDynamicColumnRenderer.java @@ -15,14 +15,11 @@ */ package com.palantir.atlasdb.table.description.render; -import static java.lang.Math.max; - import static com.palantir.atlasdb.table.description.render.ComponentRenderers.TypeName; import static com.palantir.atlasdb.table.description.render.ComponentRenderers.VarName; import static com.palantir.atlasdb.table.description.render.ComponentRenderers.typeName; import static com.palantir.atlasdb.table.description.render.ComponentRenderers.varName; - -import java.util.List; +import static java.lang.Math.max; import com.google.common.base.Joiner; import com.google.common.collect.Iterables; @@ -32,6 +29,7 @@ import com.palantir.atlasdb.table.description.NameMetadataDescription; import com.palantir.atlasdb.table.description.ValueType; import com.palantir.logsafe.Preconditions; +import java.util.List; @SuppressWarnings("checkstyle:all") // too many warnings to fix class RowOrDynamicColumnRenderer extends Renderer { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/StreamStoreRenderer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/StreamStoreRenderer.java index cd6fdcdb848..babb23cbae5 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/StreamStoreRenderer.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/StreamStoreRenderer.java @@ -15,33 +15,6 @@ */ package com.palantir.atlasdb.table.description.render; -import java.io.BufferedInputStream; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.security.DigestInputStream; -import java.security.MessageDigest; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Optional; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.function.BiConsumer; -import java.util.function.Supplier; - -import javax.annotation.CheckForNull; -import javax.annotation.Generated; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Functions; import com.google.common.base.Preconditions; import com.google.common.collect.ArrayListMultimap; @@ -83,8 +56,31 @@ import com.palantir.util.crypto.Sha256Hash; import com.palantir.util.file.DeleteOnCloseFileInputStream; import com.palantir.util.file.TempFileUtils; - +import java.io.BufferedInputStream; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.security.DigestInputStream; +import java.security.MessageDigest; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.function.BiConsumer; +import java.util.function.Supplier; +import javax.annotation.CheckForNull; +import javax.annotation.Generated; import net.jpountz.lz4.LZ4BlockInputStream; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("checkstyle:all") // too many warnings to fix public class StreamStoreRenderer { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableClassRendererV2.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableClassRendererV2.java index dbcbce14179..0d3207824ef 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableClassRendererV2.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableClassRendererV2.java @@ -23,21 +23,6 @@ import static com.palantir.atlasdb.table.description.render.Renderers.getColumnClass; import static com.palantir.atlasdb.table.description.render.Renderers.getColumnClassForGenericTypeParameter; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.SortedMap; -import java.util.SortedSet; -import java.util.function.Function; -import java.util.stream.Collectors; - -import javax.annotation.Generated; -import javax.lang.model.element.Modifier; - import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMultimap; @@ -68,6 +53,19 @@ import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.function.Function; +import java.util.stream.Collectors; +import javax.annotation.Generated; +import javax.lang.model.element.Modifier; public class TableClassRendererV2 { private final String packageName; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableFactoryRenderer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableFactoryRenderer.java index 2cb6f26207c..8cc39d6c1e1 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableFactoryRenderer.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableFactoryRenderer.java @@ -17,16 +17,6 @@ import static com.palantir.atlasdb.AtlasDbConstants.SCHEMA_V2_TABLE_NAME; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.SortedMap; -import java.util.stream.Collectors; - -import javax.annotation.Generated; -import javax.lang.model.element.Modifier; - import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; @@ -45,6 +35,14 @@ import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.WildcardTypeName; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.SortedMap; +import java.util.stream.Collectors; +import javax.annotation.Generated; +import javax.lang.model.element.Modifier; public final class TableFactoryRenderer { private final String schemaName; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableRenderer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableRenderer.java index 0145101eea1..a11f8a91b09 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableRenderer.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableRenderer.java @@ -15,30 +15,6 @@ */ package com.palantir.atlasdb.table.description.render; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumSet; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.SortedMap; -import java.util.SortedSet; -import java.util.UUID; -import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; -import java.util.function.BiFunction; -import java.util.function.Supplier; -import java.util.stream.Stream; - -import javax.annotation.Generated; -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; @@ -114,6 +90,28 @@ import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; import com.palantir.util.AssertUtils; import com.palantir.util.crypto.Sha256Hash; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.UUID; +import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; +import java.util.function.BiFunction; +import java.util.function.Supplier; +import java.util.stream.Stream; +import javax.annotation.Generated; +import javax.annotation.Nullable; @SuppressWarnings("checkstyle:all") // too many warnings to fix public class TableRenderer { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/generation/ColumnValues.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/generation/ColumnValues.java index 986865758f4..ea0fc4845e9 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/generation/ColumnValues.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/generation/ColumnValues.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.table.generation; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.Collection; -import java.util.Collections; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; @@ -35,6 +27,13 @@ import com.palantir.common.base.Throwables; import com.palantir.common.persist.Persistable; import com.palantir.common.persist.Persistable.Hydrator; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; public final class ColumnValues { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/generation/Triggers.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/generation/Triggers.java index 5412338ddc3..fb350152e0a 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/generation/Triggers.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/generation/Triggers.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.table.generation; -import java.util.List; - import com.google.common.base.Function; import com.google.common.collect.Lists; import com.palantir.atlasdb.transaction.api.Transaction; +import java.util.List; public class Triggers { public static List getAllTriggers(Transaction t, diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/tracing/CloseableTrace.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/tracing/CloseableTrace.java index 18d8abb85d1..bf07e11625a 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/tracing/CloseableTrace.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/tracing/CloseableTrace.java @@ -15,14 +15,12 @@ */ package com.palantir.atlasdb.tracing; -import javax.annotation.Nullable; - -import org.slf4j.helpers.MessageFormatter; - import com.google.common.collect.ObjectArrays; import com.palantir.tracing.Tracer; import com.palantir.tracing.api.OpenSpan; import com.palantir.tracing.api.SpanType; +import javax.annotation.Nullable; +import org.slf4j.helpers.MessageFormatter; public final class CloseableTrace implements AutoCloseable { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractConditionAwareTransactionManager.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractConditionAwareTransactionManager.java index 981011ad894..b7ae5767927 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractConditionAwareTransactionManager.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractConditionAwareTransactionManager.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.function.Supplier; - import com.palantir.atlasdb.cache.TimestampCache; import com.palantir.atlasdb.transaction.api.ConditionAwareTransactionTask; import com.palantir.atlasdb.transaction.api.PreCommitCondition; import com.palantir.atlasdb.transaction.api.TransactionTask; import com.palantir.atlasdb.util.MetricsManager; +import java.util.function.Supplier; public abstract class AbstractConditionAwareTransactionManager extends AbstractTransactionManager { private final Supplier retryStrategy; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionManager.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionManager.java index f32007bf68f..29ce0e5def0 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionManager.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionManager.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.util.concurrent.RateLimiter; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.palantir.atlasdb.cache.TimestampCache; @@ -36,6 +27,13 @@ import com.palantir.atlasdb.transaction.api.TransactionTask; import com.palantir.atlasdb.util.MetricsManager; import com.palantir.logsafe.Preconditions; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class AbstractTransactionManager implements TransactionManager { private static final int GET_RANGES_QUEUE_SIZE_WARNING_THRESHOLD = 1000; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTransaction.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTransaction.java index c307c963d76..d9f56e84d57 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTransaction.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTransaction.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.Collection; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.collect.ImmutableMap; @@ -41,6 +33,12 @@ import com.palantir.atlasdb.transaction.api.TransactionFailedException; import com.palantir.atlasdb.transaction.service.TransactionService; import com.palantir.util.Pair; +import java.util.Collection; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class CachingTransaction extends ForwardingTransaction { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManager.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManager.java index 76a2fa17e73..e1d03624a5c 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManager.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManager.java @@ -15,15 +15,13 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.Map; - -import javax.annotation.Nullable; - import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.transaction.api.ConflictHandler; +import java.util.Map; +import javax.annotation.Nullable; public class ConflictDetectionManager { private final LoadingCache cache; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManagers.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManagers.java index 00823e86a2a..5c24c6070b6 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManagers.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManagers.java @@ -15,15 +15,14 @@ */ package com.palantir.atlasdb.transaction.impl; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.cache.CacheLoader; import com.google.common.collect.Maps; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.table.description.TableMetadata; import com.palantir.atlasdb.transaction.api.ConflictHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class ConflictDetectionManagers { private static final Logger log = LoggerFactory.getLogger(ConflictDetectionManagers.class); diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ForwardingTransaction.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ForwardingTransaction.java index 007aa763f2e..fdf71c56f06 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ForwardingTransaction.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ForwardingTransaction.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.SortedMap; -import java.util.function.BiFunction; -import java.util.stream.Stream; - import com.google.common.collect.ForwardingObject; import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection; import com.palantir.atlasdb.keyvalue.api.Cell; @@ -37,6 +29,13 @@ import com.palantir.atlasdb.transaction.api.TransactionReadSentinelBehavior; import com.palantir.atlasdb.transaction.service.TransactionService; import com.palantir.common.base.BatchingVisitable; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.SortedMap; +import java.util.function.BiFunction; +import java.util.stream.Stream; public abstract class ForwardingTransaction extends ForwardingObject implements Transaction { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/Log4JTracingTransaction.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/Log4JTracingTransaction.java index ee88a59bc80..f44b1b664e9 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/Log4JTracingTransaction.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/Log4JTracingTransaction.java @@ -15,9 +15,8 @@ */ package com.palantir.atlasdb.transaction.impl; -import org.slf4j.Logger; - import com.palantir.atlasdb.transaction.api.Transaction; +import org.slf4j.Logger; public class Log4JTracingTransaction extends TracingTransaction { private final Logger logger; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/NoDuplicateWritesTransaction.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/NoDuplicateWritesTransaction.java index c36a83a7ad0..0b7b90ee6fa 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/NoDuplicateWritesTransaction.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/NoDuplicateWritesTransaction.java @@ -15,16 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.Arrays; -import java.util.Collections; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.ExecutionException; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -35,6 +25,14 @@ import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.transaction.api.Transaction; import com.palantir.util.AssertUtils; +import java.util.Arrays; +import java.util.Collections; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.concurrent.ExecutionException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Disallows the same cell from being written twice with different values within diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ReadTransaction.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ReadTransaction.java index b462141138e..840d7b5b133 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ReadTransaction.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ReadTransaction.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; -import java.util.function.BiFunction; -import java.util.stream.Stream; - import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection; @@ -34,6 +27,12 @@ import com.palantir.common.base.BatchingVisitable; import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.function.BiFunction; +import java.util.stream.Stream; public class ReadTransaction extends ForwardingTransaction { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/SweepStrategyManager.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/SweepStrategyManager.java index a3d49619b88..fde83084487 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/SweepStrategyManager.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/SweepStrategyManager.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.Map; - import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy; +import java.util.Map; public class SweepStrategyManager { private final RecomputingSupplier> supplier; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/SweepStrategyManagers.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/SweepStrategyManagers.java index b88db128b92..c1542384096 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/SweepStrategyManagers.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/SweepStrategyManagers.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.Map; -import java.util.Set; - import com.google.common.base.Functions; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableMap; @@ -27,6 +24,8 @@ import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy; import com.palantir.atlasdb.table.description.Schema; import com.palantir.atlasdb.table.description.TableMetadata; +import java.util.Map; +import java.util.Set; public class SweepStrategyManagers { private SweepStrategyManagers() { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TracingTransaction.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TracingTransaction.java index 7751e9f20b4..6ca1703abea 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TracingTransaction.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TracingTransaction.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.Map; -import java.util.Set; - import com.google.common.io.BaseEncoding; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.transaction.api.Transaction; +import java.util.Map; +import java.util.Set; public abstract class TracingTransaction extends ForwardingTransaction { private final Transaction delegate; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionConstants.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionConstants.java index 7a192958bc2..6b94317e1bb 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionConstants.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionConstants.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.Set; - import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.TableReference; @@ -24,6 +22,7 @@ import com.palantir.atlasdb.ptobject.EncodingUtils; import com.palantir.atlasdb.table.description.TableMetadata; import com.palantir.atlasdb.table.description.ValueType; +import java.util.Set; public class TransactionConstants { private TransactionConstants() {/* */} diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionRetryStrategy.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionRetryStrategy.java index 661402df7dc..fb10e63f180 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionRetryStrategy.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionRetryStrategy.java @@ -16,15 +16,6 @@ package com.palantir.atlasdb.transaction.impl; -import java.util.Random; -import java.util.UUID; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.function.IntPredicate; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.fasterxml.jackson.annotation.JsonCreator; import com.github.rholder.retry.Attempt; import com.github.rholder.retry.BlockStrategies; @@ -41,6 +32,13 @@ import com.palantir.common.base.Throwables; import com.palantir.exception.NotInitializedException; import com.palantir.logsafe.SafeArg; +import java.util.Random; +import java.util.UUID; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.function.IntPredicate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class TransactionRetryStrategy { public enum Strategies { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/Transactions.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/Transactions.java index 84f9115ce25..c7faa96400d 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/Transactions.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/Transactions.java @@ -15,15 +15,14 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.Arrays; -import java.util.Map; -import java.util.Set; - import com.google.common.collect.Maps; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.transaction.api.Transaction; +import java.util.Arrays; +import java.util.Map; +import java.util.Set; public class Transactions { private Transactions() { /* */ } diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/UnmodifiableTransaction.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/UnmodifiableTransaction.java index 30982c65256..757c12fd08f 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/UnmodifiableTransaction.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/UnmodifiableTransaction.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.Map; -import java.util.Set; - import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.transaction.api.Transaction; import com.palantir.atlasdb.transaction.api.TransactionConflictException; +import java.util.Map; +import java.util.Set; public class UnmodifiableTransaction extends ForwardingTransaction { final Transaction delegate; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/AccumulatingValueMetric.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/AccumulatingValueMetric.java index 4425b7c7d35..1681890d57c 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/AccumulatingValueMetric.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/AccumulatingValueMetric.java @@ -15,9 +15,8 @@ */ package com.palantir.atlasdb.util; -import java.util.concurrent.atomic.AtomicLong; - import com.codahale.metrics.Gauge; +import java.util.concurrent.atomic.AtomicLong; public class AccumulatingValueMetric implements Gauge { private final AtomicLong value = new AtomicLong(0L); diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/AtlasDbMetrics.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/AtlasDbMetrics.java index 2b11e4667ce..d5c577acda3 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/AtlasDbMetrics.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/AtlasDbMetrics.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.util; -import java.util.Map; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.codahale.metrics.MetricRegistry; import com.github.benmanes.caffeine.cache.Cache; import com.palantir.tritium.event.InvocationContext; @@ -31,6 +23,12 @@ import com.palantir.tritium.metrics.caffeine.CaffeineCacheStats; import com.palantir.tritium.metrics.registry.TaggedMetricRegistry; import com.palantir.tritium.proxy.Instrumentation; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class AtlasDbMetrics { private static final Logger log = LoggerFactory.getLogger(AtlasDbMetrics.class); diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/InstrumentationUtils.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/InstrumentationUtils.java index fd89e1ba6e0..4b75ce3847f 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/InstrumentationUtils.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/InstrumentationUtils.java @@ -16,15 +16,14 @@ package com.palantir.atlasdb.util; -import java.lang.reflect.Method; -import java.util.concurrent.TimeUnit; -import java.util.function.BooleanSupplier; - import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.SlidingTimeWindowArrayReservoir; import com.codahale.metrics.Timer; import com.palantir.tritium.event.InstrumentationProperties; import com.palantir.tritium.event.InvocationContext; +import java.lang.reflect.Method; +import java.util.concurrent.TimeUnit; +import java.util.function.BooleanSupplier; final class InstrumentationUtils { static final String FAILURES_METRIC_NAME = "failures"; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/MetricNameUtils.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/MetricNameUtils.java index ae7db247c57..ed46d3021d5 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/MetricNameUtils.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/MetricNameUtils.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.util; +import com.google.common.base.Preconditions; import java.util.Map; import java.util.stream.Collectors; -import com.google.common.base.Preconditions; - public final class MetricNameUtils { private static final int MAX_ALLOWED_TAGS = 10; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/SlidingWindowMeanGauge.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/SlidingWindowMeanGauge.java index 697e288e396..ec559c7ff25 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/SlidingWindowMeanGauge.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/SlidingWindowMeanGauge.java @@ -16,13 +16,12 @@ package com.palantir.atlasdb.util; -import java.util.concurrent.TimeUnit; - import com.codahale.metrics.Gauge; import com.codahale.metrics.Histogram; import com.codahale.metrics.SlidingTimeWindowArrayReservoir; import com.codahale.metrics.Snapshot; import com.google.common.annotations.VisibleForTesting; +import java.util.concurrent.TimeUnit; public class SlidingWindowMeanGauge implements Gauge { private final Histogram histogram; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/SlidingWindowMetricsInvocationHandler.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/SlidingWindowMetricsInvocationHandler.java index 7455c469eaf..40786bd87a7 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/SlidingWindowMetricsInvocationHandler.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/SlidingWindowMetricsInvocationHandler.java @@ -16,18 +16,6 @@ package com.palantir.atlasdb.util; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.SlidingTimeWindowArrayReservoir; import com.codahale.metrics.Timer; @@ -37,6 +25,15 @@ import com.palantir.tritium.event.AbstractInvocationEventHandler; import com.palantir.tritium.event.DefaultInvocationContext; import com.palantir.tritium.event.InvocationContext; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.function.Function; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A modified version of {@link com.palantir.tritium.event.metrics.MetricsInvocationEventHandler} that uses a diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/TaggedMetricsInvocationEventHandler.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/TaggedMetricsInvocationEventHandler.java index aaab9a92ae6..60af8b400d2 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/TaggedMetricsInvocationEventHandler.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/TaggedMetricsInvocationEventHandler.java @@ -15,17 +15,6 @@ */ package com.palantir.atlasdb.util; -import java.lang.reflect.Method; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.codahale.metrics.MetricRegistry; import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.UnsafeArg; @@ -34,6 +23,14 @@ import com.palantir.tritium.event.InvocationContext; import com.palantir.tritium.metrics.registry.MetricName; import com.palantir.tritium.metrics.registry.TaggedMetricRegistry; +import java.lang.reflect.Method; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.function.Function; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A simplified and yet extended version of Tritium's MetricsInvocationEventHandler. This class supports augmenting diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueServiceTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueServiceTest.java index f13982f5798..00b950767d8 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueServiceTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueServiceTest.java @@ -22,10 +22,9 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.api.CheckAndSetCompatibility; import com.palantir.atlasdb.keyvalue.api.KeyValueService; +import org.junit.Test; public class DualWriteKeyValueServiceTest { private final KeyValueService delegate1 = mock(KeyValueService.class); diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/IterablePartitionerTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/IterablePartitionerTest.java index 60aebc7e359..cd8b73c409f 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/IterablePartitionerTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/IterablePartitionerTest.java @@ -15,8 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.impl; +import com.google.common.collect.Lists; +import com.palantir.logsafe.SafeArg; +import com.palantir.logsafe.UnsafeArg; import java.util.List; - import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Test; @@ -25,10 +27,6 @@ import org.mockito.Mockito; import org.slf4j.Logger; -import com.google.common.collect.Lists; -import com.palantir.logsafe.SafeArg; -import com.palantir.logsafe.UnsafeArg; - @RunWith(Parameterized.class) public class IterablePartitionerTest { diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueServiceTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueServiceTest.java index 9433afa16d2..6ff4d217e88 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueServiceTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueServiceTest.java @@ -25,9 +25,19 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.spi.LoggingEvent; +import ch.qos.logback.core.Appender; +import com.google.common.collect.ImmutableMap; +import com.palantir.atlasdb.keyvalue.api.Cell; +import com.palantir.atlasdb.keyvalue.api.KeyValueService; +import com.palantir.atlasdb.keyvalue.api.Namespace; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.keyvalue.api.Value; +import com.palantir.atlasdb.logging.KvsProfilingLogger; import java.util.Map; import java.util.function.Supplier; - import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -35,19 +45,6 @@ import org.mockito.stubbing.Answer; import org.slf4j.LoggerFactory; -import com.google.common.collect.ImmutableMap; -import com.palantir.atlasdb.keyvalue.api.Cell; -import com.palantir.atlasdb.keyvalue.api.KeyValueService; -import com.palantir.atlasdb.keyvalue.api.Namespace; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.atlasdb.keyvalue.api.Value; -import com.palantir.atlasdb.logging.KvsProfilingLogger; - -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.Logger; -import ch.qos.logback.classic.spi.LoggingEvent; -import ch.qos.logback.core.Appender; - /** * We test behaviour for every of the three maybeLog(...) methods from ProfilingKeyValueService using public facing * methods that use them diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/SweepStatsKeyValueServiceTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/SweepStatsKeyValueServiceTest.java index bdc25d6ebc3..04d83a7f092 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/SweepStatsKeyValueServiceTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/SweepStatsKeyValueServiceTest.java @@ -20,16 +20,14 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.nio.charset.StandardCharsets; - -import org.junit.Before; -import org.junit.Test; - import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.RangeRequest; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.timestamp.TimestampService; +import java.nio.charset.StandardCharsets; +import org.junit.Before; +import org.junit.Test; public class SweepStatsKeyValueServiceTest { private static final byte[] ROW = "row".getBytes(StandardCharsets.UTF_8); diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/TracingKeyValueServiceTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/TracingKeyValueServiceTest.java index ac0f7180179..d35776abb41 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/TracingKeyValueServiceTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/TracingKeyValueServiceTest.java @@ -27,18 +27,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; - import com.google.common.base.Charsets; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -61,6 +49,16 @@ import com.palantir.tracing.Tracer; import com.palantir.tracing.api.SpanType; import com.palantir.util.paging.TokenBackedBasicResultsPage; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.runners.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class TracingKeyValueServiceTest { diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/KeyValueServiceLogArbitratorTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/KeyValueServiceLogArbitratorTest.java index 5e65e908188..9ab55c1fc22 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/KeyValueServiceLogArbitratorTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/KeyValueServiceLogArbitratorTest.java @@ -17,9 +17,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.api.TableReference; +import org.junit.Test; public class KeyValueServiceLogArbitratorTest { private static final KeyValueServiceLogArbitrator ALL_UNSAFE = KeyValueServiceLogArbitrator.ALL_UNSAFE; diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/KvsProfilingLoggerTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/KvsProfilingLoggerTest.java index 98238faffdb..72f687b9f7d 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/KvsProfilingLoggerTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/KvsProfilingLoggerTest.java @@ -22,11 +22,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import org.junit.After; -import org.junit.Test; - import com.palantir.logsafe.Arg; import com.palantir.logsafe.SafeArg; +import org.junit.After; +import org.junit.Test; public class KvsProfilingLoggerTest { private static final String LOG_TEMPLATE_1 = "The method {} was called."; diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/LoggingArgsTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/LoggingArgsTest.java index 38a5401390a..cb3256c2569 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/LoggingArgsTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/LoggingArgsTest.java @@ -19,13 +19,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; -import java.util.List; - -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.mockito.Mockito; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; @@ -39,6 +32,11 @@ import com.palantir.logsafe.Arg; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; +import java.util.List; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.mockito.Mockito; public class LoggingArgsTest { private static final String ARG_NAME = "argName"; diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/SafeLoggableDataTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/SafeLoggableDataTest.java index 76238f8049d..af2e2a815d5 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/SafeLoggableDataTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/SafeLoggableDataTest.java @@ -17,10 +17,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.keyvalue.api.TableReference; +import org.junit.Test; public class SafeLoggableDataTest { private static final TableReference TABLE_REFERENCE_1 = TableReference.createFromFullyQualifiedName("atlas.db"); diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/SafeLoggableDataUtilsTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/SafeLoggableDataUtilsTest.java index 6745bdced5c..32a26e810bb 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/SafeLoggableDataUtilsTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/SafeLoggableDataUtilsTest.java @@ -17,8 +17,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; @@ -31,6 +29,7 @@ import com.palantir.atlasdb.table.description.TableMetadata; import com.palantir.atlasdb.table.description.UniformRowNamePartitioner; import com.palantir.atlasdb.table.description.ValueType; +import org.junit.Test; public class SafeLoggableDataUtilsTest { private static final TableReference TABLE_REFERENCE_1 = TableReference.createFromFullyQualifiedName("atlas.db"); diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinitionBuilderTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinitionBuilderTest.java index 5c6214da40c..9c2ed389e9a 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinitionBuilderTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinitionBuilderTest.java @@ -16,9 +16,8 @@ package com.palantir.atlasdb.schema.stream; -import org.junit.Test; - import com.palantir.atlasdb.table.description.ValueType; +import org.junit.Test; public class StreamStoreDefinitionBuilderTest { diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/schema/stream/StreamTableTypeTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/schema/stream/StreamTableTypeTest.java index becfda81fc9..5f899038819 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/schema/stream/StreamTableTypeTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/schema/stream/StreamTableTypeTest.java @@ -20,13 +20,11 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import java.util.List; - -import org.junit.Test; - import com.google.common.collect.Lists; import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.keyvalue.api.TableReference; +import java.util.List; +import org.junit.Test; public class StreamTableTypeTest { diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/stream/BlockConsumingInputStreamTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/stream/BlockConsumingInputStreamTest.java index 85fd6c76d4c..7f9841db3d7 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/stream/BlockConsumingInputStreamTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/stream/BlockConsumingInputStreamTest.java @@ -25,17 +25,15 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import com.palantir.atlasdb.schema.stream.StreamStoreDefinition; import java.io.IOException; import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.util.Arrays; - import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import com.palantir.atlasdb.schema.stream.StreamStoreDefinition; - @SuppressWarnings("ResultOfMethodCallIgnored") public class BlockConsumingInputStreamTest { private static final int DATA_SIZE = 4; diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/stream/StandardPeriodicBackoffStrategyTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/stream/StandardPeriodicBackoffStrategyTest.java index cd87c47da75..947a875a87b 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/stream/StandardPeriodicBackoffStrategyTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/stream/StandardPeriodicBackoffStrategyTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import java.util.concurrent.atomic.AtomicReference; - import org.junit.Test; public class StandardPeriodicBackoffStrategyTest { diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/AbstractSchemaApiTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/AbstractSchemaApiTest.java index 275ab42a7f9..5010ee77be0 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/AbstractSchemaApiTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/AbstractSchemaApiTest.java @@ -23,16 +23,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.SortedMap; -import java.util.TreeMap; - -import org.junit.Test; -import org.mockito.ArgumentCaptor; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; @@ -52,6 +42,14 @@ import com.palantir.atlasdb.transaction.api.Transaction; import com.palantir.atlasdb.transaction.impl.AbstractTransaction; import com.palantir.common.base.BatchingVisitableFromIterable; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; +import org.junit.Test; +import org.mockito.ArgumentCaptor; public abstract class AbstractSchemaApiTest { private static final TableReference tableRef = diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/ApiTestSchema.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/ApiTestSchema.java index 66c9035251a..7bcc0320cae 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/ApiTestSchema.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/ApiTestSchema.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.table.description; -import java.io.File; -import java.util.stream.Stream; - import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.schema.AtlasSchema; import com.palantir.atlasdb.table.description.test.StringValuePersister; +import java.io.File; +import java.util.stream.Stream; /** * Schema used to test for Table API correctness and for accidental TableRenderer changes. diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/ConflictHandlersTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/ConflictHandlersTest.java index ac0f02b2a41..02a81c1c314 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/ConflictHandlersTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/ConflictHandlersTest.java @@ -17,10 +17,9 @@ import static org.junit.Assert.assertEquals; -import org.junit.Test; - import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.atlasdb.transaction.api.ConflictHandler; +import org.junit.Test; public class ConflictHandlersTest { @Test diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/GenericTestSchema.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/GenericTestSchema.java index db16a80cf35..a3a3ff67569 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/GenericTestSchema.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/GenericTestSchema.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.table.description; -import java.io.File; - import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.schema.AtlasSchema; +import java.io.File; public class GenericTestSchema implements AtlasSchema { public static final AtlasSchema INSTANCE = new GenericTestSchema(); diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/NameComponentDescriptionTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/NameComponentDescriptionTest.java index bcc82ffd48b..58e8247ce0e 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/NameComponentDescriptionTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/NameComponentDescriptionTest.java @@ -17,11 +17,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.LogSafety; +import org.junit.Test; public class NameComponentDescriptionTest { private static final String COMPONENT_NAME = "rowComponent"; diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/NamedColumnDescriptionTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/NamedColumnDescriptionTest.java index 99bbf16de1f..f9f4d546635 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/NamedColumnDescriptionTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/NamedColumnDescriptionTest.java @@ -17,10 +17,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.LogSafety; +import org.junit.Test; public class NamedColumnDescriptionTest { private static final String SHORT_NAME = "shortName"; diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaApiTestImpl.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaApiTestImpl.java index 9aac1184bc5..a2d9078f62c 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaApiTestImpl.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaApiTestImpl.java @@ -17,13 +17,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Collectors; - -import org.junit.Test; - import com.google.common.hash.Hashing; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.ColumnSelection; @@ -38,6 +31,11 @@ import com.palantir.atlasdb.transaction.api.Transaction; import com.palantir.common.base.BatchingVisitableView; import com.palantir.common.base.BatchingVisitables; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.stream.Collectors; +import org.junit.Test; public class SchemaApiTestImpl extends AbstractSchemaApiTest { diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaApiTestV2Impl.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaApiTestV2Impl.java index a560660e4b6..9a909ee46b4 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaApiTestV2Impl.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaApiTestV2Impl.java @@ -24,12 +24,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import java.util.List; -import java.util.Map; -import java.util.Optional; - -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.api.RangeRequest; import com.palantir.atlasdb.table.description.generated.ApiTestTableFactory; import com.palantir.atlasdb.table.description.generated.SchemaApiTestTable; @@ -37,6 +31,10 @@ import com.palantir.atlasdb.table.description.test.StringValue; import com.palantir.atlasdb.transaction.api.Transaction; import com.palantir.atlasdb.transaction.impl.AbstractTransaction; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import org.junit.Test; public class SchemaApiTestV2Impl extends AbstractSchemaApiTest { diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaHotspottingTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaHotspottingTest.java index b1e8934a629..f45aa5a50cc 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaHotspottingTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaHotspottingTest.java @@ -20,16 +20,14 @@ import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; +import com.palantir.atlasdb.keyvalue.api.Namespace; import java.io.File; import java.io.IOException; import java.util.Arrays; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.palantir.atlasdb.keyvalue.api.Namespace; - @SuppressWarnings({"checkstyle:Indentation", "checkstyle:RightCurly"}) public class SchemaHotspottingTest { @Rule diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaTest.java index 85dee4eaec6..d9f742f35c6 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaTest.java @@ -15,39 +15,34 @@ */ package com.palantir.atlasdb.table.description; +import static com.palantir.atlasdb.AtlasDbConstants.SCHEMA_V2_TABLE_NAME; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; - -import static com.palantir.atlasdb.AtlasDbConstants.SCHEMA_V2_TABLE_NAME; +import com.google.common.collect.Streams; +import com.google.common.io.Files; +import com.palantir.atlasdb.AtlasDbConstants; +import com.palantir.atlasdb.keyvalue.api.Namespace; +import com.palantir.atlasdb.keyvalue.api.TableReference; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; - import org.apache.commons.lang3.StringUtils; import org.assertj.core.api.Assertions; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.google.common.collect.Streams; -import com.google.common.io.Files; -import com.palantir.atlasdb.AtlasDbConstants; -import com.palantir.atlasdb.keyvalue.api.Namespace; -import com.palantir.atlasdb.keyvalue.api.TableReference; - public class SchemaTest { @Rule public TemporaryFolder testFolder = new TemporaryFolder(); diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemasTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemasTest.java index e78566c6975..8bb6b9b2a9f 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemasTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemasTest.java @@ -15,10 +15,16 @@ */ package com.palantir.atlasdb.table.description; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import com.palantir.atlasdb.keyvalue.api.KeyValueService; +import com.palantir.atlasdb.keyvalue.api.Namespace; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.schema.SweepSchema; +import com.palantir.atlasdb.transaction.api.ConflictHandler; import java.util.Arrays; import java.util.Map; import java.util.Set; - import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.MatcherAssert; @@ -29,14 +35,6 @@ import org.junit.Before; import org.junit.Test; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import com.palantir.atlasdb.keyvalue.api.KeyValueService; -import com.palantir.atlasdb.keyvalue.api.Namespace; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.atlasdb.schema.SweepSchema; -import com.palantir.atlasdb.transaction.api.ConflictHandler; - @SuppressWarnings({"checkstyle:Indentation", "checkstyle:RightCurly", "checkstyle:WhitespaceAround"}) public class SchemasTest { private static final String TABLE_NAME = "testTable"; @@ -144,4 +142,3 @@ private byte[] getSimpleTableDefinitionAsBytes(TableReference tableRef) { return getSimpleTableDefinition(tableRef).toTableMetadata().persistToBytes(); } } - diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableDefinitionTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableDefinitionTest.java index 7f38b68d5c1..fedab6e5da0 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableDefinitionTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableDefinitionTest.java @@ -18,12 +18,11 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.Test; - import com.google.common.collect.Iterables; import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.LogSafety; +import org.junit.Test; @SuppressWarnings("checkstyle:all") // too many warnings to fix public class TableDefinitionTest { diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableMetadataPersistenceTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableMetadataPersistenceTest.java index a12e84370e1..a027916467b 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableMetadataPersistenceTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableMetadataPersistenceTest.java @@ -15,20 +15,18 @@ */ package com.palantir.atlasdb.table.description; +import com.google.common.collect.Lists; +import com.palantir.atlasdb.AtlasDbConstants; +import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; +import com.palantir.atlasdb.schema.stream.StreamStoreDefinitionBuilder; +import com.palantir.atlasdb.transaction.api.ConflictHandler; import java.util.Collection; - import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import com.google.common.collect.Lists; -import com.palantir.atlasdb.AtlasDbConstants; -import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; -import com.palantir.atlasdb.schema.stream.StreamStoreDefinitionBuilder; -import com.palantir.atlasdb.transaction.api.ConflictHandler; - @RunWith(Parameterized.class) @SuppressWarnings("checkstyle:all") // too many warnings to fix public class TableMetadataPersistenceTest { diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableMetadataTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableMetadataTest.java index fd2db1cb156..a5fbf6fbcdf 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableMetadataTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableMetadataTest.java @@ -17,11 +17,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.LogSafety; import com.palantir.atlasdb.transaction.api.ConflictHandler; +import org.junit.Test; public class TableMetadataTest { private static final TableMetadata DEFAULT_TABLE_METADATA = TableMetadata.allDefault(); diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/render/TableRendererTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/render/TableRendererTest.java index 93f7a510bf3..a5bca5598f0 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/render/TableRendererTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/render/TableRendererTest.java @@ -20,17 +20,15 @@ import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertThat; -import java.util.SortedSet; -import java.util.TreeSet; - -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.table.description.IndexMetadata; import com.palantir.atlasdb.table.description.OptionalType; import com.palantir.atlasdb.table.description.TableDefinition; import com.palantir.atlasdb.table.description.ValueType; +import java.util.SortedSet; +import java.util.TreeSet; +import org.junit.Test; public class TableRendererTest { diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/tracing/CloseableTraceTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/tracing/CloseableTraceTest.java index e6d3acc0f8b..9876e6934bf 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/tracing/CloseableTraceTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/tracing/CloseableTraceTest.java @@ -22,17 +22,15 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertThat; +import com.palantir.tracing.AlwaysSampler; +import com.palantir.tracing.Tracer; +import com.palantir.tracing.api.Span; import java.util.List; import java.util.Optional; - import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.palantir.tracing.AlwaysSampler; -import com.palantir.tracing.Tracer; -import com.palantir.tracing.api.Span; - public class CloseableTraceTest { private static final String NAME = CloseableTraceTest.class.getName(); diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/tracing/TestSpanObserver.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/tracing/TestSpanObserver.java index fc4deb36238..2626e643b49 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/tracing/TestSpanObserver.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/tracing/TestSpanObserver.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.tracing; +import com.palantir.tracing.api.Span; +import com.palantir.tracing.api.SpanObserver; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.palantir.tracing.api.Span; -import com.palantir.tracing.api.SpanObserver; - public class TestSpanObserver implements SpanObserver { private final List spans = new ArrayList<>(); diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/transaction/impl/ReadTransactionShould.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/transaction/impl/ReadTransactionShould.java index 1c70a3dbeda..5953b3ea722 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/transaction/impl/ReadTransactionShould.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/transaction/impl/ReadTransactionShould.java @@ -23,15 +23,6 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Map; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mockito; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -43,6 +34,13 @@ import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.common.base.Throwables; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Map; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mockito; public class ReadTransactionShould { diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionRetryStrategyTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionRetryStrategyTest.java index 9dd6d86c68a..8562dfadb5b 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionRetryStrategyTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionRetryStrategyTest.java @@ -20,26 +20,23 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.when; +import com.github.rholder.retry.BlockStrategy; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import com.palantir.atlasdb.transaction.api.TransactionFailedNonRetriableException; +import com.palantir.atlasdb.transaction.api.TransactionFailedRetriableException; +import com.palantir.atlasdb.transaction.impl.TransactionRetryStrategy.Retryable; import java.util.List; import java.util.concurrent.ThreadLocalRandom; import java.util.function.IntPredicate; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import com.github.rholder.retry.BlockStrategy; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import com.palantir.atlasdb.transaction.api.TransactionFailedNonRetriableException; -import com.palantir.atlasdb.transaction.api.TransactionFailedRetriableException; -import com.palantir.atlasdb.transaction.impl.TransactionRetryStrategy.Retryable; - @RunWith(MockitoJUnitRunner.class) public class TransactionRetryStrategyTest { private final TestBlockStrategy blockStrategy = new TestBlockStrategy(); diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AnnotatedCallableTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AnnotatedCallableTest.java index 19bed822ac5..bf663d3ac79 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AnnotatedCallableTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AnnotatedCallableTest.java @@ -24,7 +24,6 @@ import java.io.IOException; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; - import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AnnotatedRunnableTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AnnotatedRunnableTest.java index 5e2fb321520..2bd2d3718bf 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AnnotatedRunnableTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AnnotatedRunnableTest.java @@ -21,7 +21,6 @@ import static org.junit.Assert.fail; import java.util.concurrent.atomic.AtomicBoolean; - import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AtlasDbMetricsTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AtlasDbMetricsTest.java index ca35895b87b..8042703e422 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AtlasDbMetricsTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AtlasDbMetricsTest.java @@ -20,10 +20,9 @@ import static org.junit.Assert.assertThat; import static org.mockito.Mockito.mock; -import org.junit.Test; - import com.codahale.metrics.MetricRegistry; import com.palantir.tritium.metrics.registry.TaggedMetricRegistry; +import org.junit.Test; public class AtlasDbMetricsTest { diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/MetricNameUtilsTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/MetricNameUtilsTest.java index 98e5dafc2e0..f11e02f6522 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/MetricNameUtilsTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/MetricNameUtilsTest.java @@ -19,14 +19,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import com.google.common.collect.ImmutableMap; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.IntStream; - import org.junit.Test; -import com.google.common.collect.ImmutableMap; - public class MetricNameUtilsTest { private static final String TAG_KEY_1 = "tag1"; private static final String TAG_VALUE_1 = "tagVal1"; diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/MetricsManagerTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/MetricsManagerTest.java index 99ffaa017fd..6a314116332 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/MetricsManagerTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/MetricsManagerTest.java @@ -17,13 +17,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; - -import org.junit.After; -import org.junit.Test; - import com.codahale.metrics.Gauge; import com.codahale.metrics.MetricFilter; import com.codahale.metrics.MetricRegistry; @@ -31,6 +24,11 @@ import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry; import com.palantir.tritium.metrics.registry.TaggedMetricRegistry; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import org.junit.After; +import org.junit.Test; public class MetricsManagerTest { private static final Class LIST_CLASS = List.class; diff --git a/atlasdb-commons/src/main/java/com/palantir/async/initializer/AsyncInitializer.java b/atlasdb-commons/src/main/java/com/palantir/async/initializer/AsyncInitializer.java index 18e3deac6f3..267e0ca0ea2 100644 --- a/atlasdb-commons/src/main/java/com/palantir/async/initializer/AsyncInitializer.java +++ b/atlasdb-commons/src/main/java/com/palantir/async/initializer/AsyncInitializer.java @@ -15,20 +15,17 @@ */ package com.palantir.async.initializer; +import com.palantir.common.concurrent.NamedThreadFactory; +import com.palantir.common.concurrent.PTExecutors; +import com.palantir.exception.NotInitializedException; +import com.palantir.logsafe.SafeArg; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; - import javax.annotation.concurrent.ThreadSafe; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.palantir.common.concurrent.NamedThreadFactory; -import com.palantir.common.concurrent.PTExecutors; -import com.palantir.exception.NotInitializedException; -import com.palantir.logsafe.SafeArg; - /** * Implements basic infrastructure to allow an object to be asynchronously initialized. * In order to be ThreadSafe, the abstract methods of the inheriting class need to be synchronized. diff --git a/atlasdb-commons/src/main/java/com/palantir/async/initializer/Callback.java b/atlasdb-commons/src/main/java/com/palantir/async/initializer/Callback.java index 48c7b0fa567..d6a28116204 100644 --- a/atlasdb-commons/src/main/java/com/palantir/async/initializer/Callback.java +++ b/atlasdb-commons/src/main/java/com/palantir/async/initializer/Callback.java @@ -15,10 +15,9 @@ */ package com.palantir.async.initializer; -import java.util.List; - import com.google.common.collect.ImmutableList; import com.palantir.common.base.Throwables; +import java.util.List; /** * A Callback is a potentially retryable operation on a resource R. The intended use is to specify a task to be run on diff --git a/atlasdb-commons/src/main/java/com/palantir/async/initializer/LambdaCallback.java b/atlasdb-commons/src/main/java/com/palantir/async/initializer/LambdaCallback.java index d06c04b9d18..6cba6ccb852 100644 --- a/atlasdb-commons/src/main/java/com/palantir/async/initializer/LambdaCallback.java +++ b/atlasdb-commons/src/main/java/com/palantir/async/initializer/LambdaCallback.java @@ -15,11 +15,10 @@ */ package com.palantir.async.initializer; +import com.palantir.common.base.Throwables; import java.util.function.BiConsumer; import java.util.function.Consumer; -import com.palantir.common.base.Throwables; - /** * Convenience class for creating callbacks using lambda expressions. */ diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/AbortingVisitors.java b/atlasdb-commons/src/main/java/com/palantir/common/base/AbortingVisitors.java index ab10b7a2e4a..cf52d2cb06c 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/base/AbortingVisitors.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/base/AbortingVisitors.java @@ -15,13 +15,12 @@ */ package com.palantir.common.base; -import java.util.Collections; -import java.util.List; - import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.palantir.common.visitor.VisitorCheckedException; +import java.util.Collections; +import java.util.List; public class AbortingVisitors { diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/AbstractBatchingVisitable.java b/atlasdb-commons/src/main/java/com/palantir/common/base/AbstractBatchingVisitable.java index 8b6489b5545..39d6a87eee3 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/base/AbstractBatchingVisitable.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/base/AbstractBatchingVisitable.java @@ -15,13 +15,12 @@ */ package com.palantir.common.base; -import java.util.Collections; -import java.util.List; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.util.Collections; +import java.util.List; /** * This abstract class will implement the required methods in {@link BatchingVisitable} diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitableFromIterable.java b/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitableFromIterable.java index 3cee15567bf..108cfe99ecb 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitableFromIterable.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitableFromIterable.java @@ -15,13 +15,12 @@ */ package com.palantir.common.base; -import java.util.Iterator; -import java.util.List; - import com.google.common.collect.Iterables; import com.palantir.common.collect.IterableUtils; import com.palantir.common.collect.IteratorUtils; import com.palantir.common.proxy.SingleCallProxy; +import java.util.Iterator; +import java.util.List; public class BatchingVisitableFromIterable extends AbstractBatchingVisitable { diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitableView.java b/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitableView.java index 903ebcc42a2..fcc73992874 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitableView.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitableView.java @@ -15,12 +15,6 @@ */ package com.palantir.common.base; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; - -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -32,6 +26,10 @@ import com.palantir.common.visitor.Visitor; import com.palantir.logsafe.Preconditions; import com.palantir.util.paging.TokenBackedBasicResultsPage; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import javax.annotation.Nullable; /** * A wrapper for {@link BatchingVisitable} which adds support for common operations. diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitables.java b/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitables.java index 8bde086e4b8..7b3587c95ee 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitables.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitables.java @@ -15,11 +15,6 @@ */ package com.palantir.common.base; -import java.util.Iterator; -import java.util.List; - -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.base.Objects; @@ -35,6 +30,9 @@ import com.palantir.util.Mutables; import com.palantir.util.paging.SimpleTokenBackedResultsPage; import com.palantir.util.paging.TokenBackedBasicResultsPage; +import java.util.Iterator; +import java.util.List; +import javax.annotation.Nullable; public class BatchingVisitables { private BatchingVisitables() {/**/} diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/ClosableIterator.java b/atlasdb-commons/src/main/java/com/palantir/common/base/ClosableIterator.java index db7866626e5..d829c8faee3 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/base/ClosableIterator.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/base/ClosableIterator.java @@ -15,6 +15,8 @@ */ package com.palantir.common.base; +import com.google.common.collect.Iterators; +import com.google.common.collect.PeekingIterator; import java.io.Closeable; import java.util.Collection; import java.util.Iterator; @@ -24,9 +26,6 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; -import com.google.common.collect.Iterators; -import com.google.common.collect.PeekingIterator; - public interface ClosableIterator extends Iterator, Closeable { @Override default void close() { } diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/ClosableIterators.java b/atlasdb-commons/src/main/java/com/palantir/common/base/ClosableIterators.java index cd16dc46537..1a4e192ab79 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/base/ClosableIterators.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/base/ClosableIterators.java @@ -15,12 +15,11 @@ */ package com.palantir.common.base; +import com.google.common.collect.ImmutableSet; import java.io.Closeable; import java.io.IOException; import java.util.Iterator; -import com.google.common.collect.ImmutableSet; - public class ClosableIterators { private ClosableIterators() {/* */} diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/OrderedSublistProvider.java b/atlasdb-commons/src/main/java/com/palantir/common/base/OrderedSublistProvider.java index 44a1f0fc000..9c03d4b25ec 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/base/OrderedSublistProvider.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/base/OrderedSublistProvider.java @@ -15,9 +15,8 @@ */ package com.palantir.common.base; -import java.util.List; - import com.palantir.common.annotation.Inclusive; +import java.util.List; /** * Provides sublists of a list of T's, where each T is identified by a long. diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/PrefetchingBatchingVisitable.java b/atlasdb-commons/src/main/java/com/palantir/common/base/PrefetchingBatchingVisitable.java index 2dd51c1ba20..75c1b98fe67 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/base/PrefetchingBatchingVisitable.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/base/PrefetchingBatchingVisitable.java @@ -15,6 +15,8 @@ */ package com.palantir.common.base; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Queues; import java.util.List; import java.util.Queue; import java.util.concurrent.ExecutorService; @@ -24,13 +26,9 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Stopwatch; -import com.google.common.collect.Queues; - /** * A {@link BatchingVisitable} that will prefetch in a background thread. If an exception happens on * the fetch thread, it will be thrown in batchAccept after all prefetched items have been visited. diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/Throwables.java b/atlasdb-commons/src/main/java/com/palantir/common/base/Throwables.java index 7ee9b2e8c88..8f3f30822c7 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/base/Throwables.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/base/Throwables.java @@ -15,6 +15,10 @@ */ package com.palantir.common.base; +import com.palantir.common.exception.AtlasDbDependencyException; +import com.palantir.common.exception.PalantirRuntimeException; +import com.palantir.exception.PalantirInterruptedException; +import com.palantir.logsafe.Preconditions; import java.io.InterruptedIOException; import java.io.PrintWriter; import java.io.StringWriter; @@ -24,15 +28,9 @@ import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.palantir.common.exception.AtlasDbDependencyException; -import com.palantir.common.exception.PalantirRuntimeException; -import com.palantir.exception.PalantirInterruptedException; -import com.palantir.logsafe.Preconditions; - /** * Utilities for creating and propagating exceptions. * diff --git a/atlasdb-commons/src/main/java/com/palantir/common/collect/EmptyQueue.java b/atlasdb-commons/src/main/java/com/palantir/common/collect/EmptyQueue.java index 49bbe2da509..1b736fc4202 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/collect/EmptyQueue.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/collect/EmptyQueue.java @@ -15,11 +15,10 @@ */ package com.palantir.common.collect; +import com.google.common.collect.ImmutableSet; import java.util.AbstractQueue; import java.util.Iterator; -import com.google.common.collect.ImmutableSet; - /** * This queue is empty and will neither return nor accept any elements * @author carrino diff --git a/atlasdb-commons/src/main/java/com/palantir/common/collect/IterableUtils.java b/atlasdb-commons/src/main/java/com/palantir/common/collect/IterableUtils.java index 0925562c574..9c5422337b6 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/collect/IterableUtils.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/collect/IterableUtils.java @@ -15,12 +15,6 @@ */ package com.palantir.common.collect; -import java.util.AbstractCollection; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - import com.google.common.base.Function; import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; @@ -28,6 +22,11 @@ import com.google.common.collect.Lists; import com.palantir.logsafe.Preconditions; import com.palantir.util.Pair; +import java.util.AbstractCollection; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; public class IterableUtils { private IterableUtils() { /* */ } diff --git a/atlasdb-commons/src/main/java/com/palantir/common/collect/IterableView.java b/atlasdb-commons/src/main/java/com/palantir/common/collect/IterableView.java index eea14863740..fa0ab06d424 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/collect/IterableView.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/collect/IterableView.java @@ -15,16 +15,6 @@ */ package com.palantir.common.collect; -import java.util.Arrays; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Spliterator; -import java.util.stream.Stream; -import java.util.stream.StreamSupport; - -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; @@ -34,6 +24,14 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.palantir.logsafe.Preconditions; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Spliterator; +import java.util.stream.Stream; +import java.util.stream.StreamSupport; +import javax.annotation.Nullable; /** * A wrapper for an iterable that gives it super chaining powers. And a nice toString. diff --git a/atlasdb-commons/src/main/java/com/palantir/common/collect/IteratorUtils.java b/atlasdb-commons/src/main/java/com/palantir/common/collect/IteratorUtils.java index 60476ad3ef2..b994a19b731 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/collect/IteratorUtils.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/collect/IteratorUtils.java @@ -15,14 +15,6 @@ */ package com.palantir.common.collect; -import java.util.Collection; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; -import java.util.Random; - -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.AbstractIterator; @@ -36,6 +28,12 @@ import com.palantir.common.visitor.Visitor; import com.palantir.logsafe.Preconditions; import com.palantir.util.Pair; +import java.util.Collection; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.Random; +import javax.annotation.Nullable; public class IteratorUtils { diff --git a/atlasdb-commons/src/main/java/com/palantir/common/collect/MapEntries.java b/atlasdb-commons/src/main/java/com/palantir/common/collect/MapEntries.java index f448a1e3434..7c0d3349784 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/collect/MapEntries.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/collect/MapEntries.java @@ -15,15 +15,14 @@ */ package com.palantir.common.collect; -import java.util.Map; -import java.util.Map.Entry; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.Maps; import com.google.common.collect.Maps.EntryTransformer; +import java.util.Map; +import java.util.Map.Entry; public class MapEntries { diff --git a/atlasdb-commons/src/main/java/com/palantir/common/collect/Maps2.java b/atlasdb-commons/src/main/java/com/palantir/common/collect/Maps2.java index b07e5ae8b58..6087e6666c0 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/collect/Maps2.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/collect/Maps2.java @@ -15,14 +15,13 @@ */ package com.palantir.common.collect; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.Maps; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; public class Maps2 { private Maps2() {/* */} diff --git a/atlasdb-commons/src/main/java/com/palantir/common/compression/BufferedDelegateInputStream.java b/atlasdb-commons/src/main/java/com/palantir/common/compression/BufferedDelegateInputStream.java index 162971ffe28..99f3d451ae8 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/compression/BufferedDelegateInputStream.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/compression/BufferedDelegateInputStream.java @@ -15,11 +15,10 @@ */ package com.palantir.common.compression; +import com.palantir.logsafe.Preconditions; import java.io.IOException; import java.io.InputStream; -import com.palantir.logsafe.Preconditions; - /** * {@link InputStream} that wraps a delegate InputStream, buffering reads * to the delegate. Allows a customized strategy for refilling the internal diff --git a/atlasdb-commons/src/main/java/com/palantir/common/compression/LZ4CompressingInputStream.java b/atlasdb-commons/src/main/java/com/palantir/common/compression/LZ4CompressingInputStream.java index 2a525d438bb..b6c5968d973 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/compression/LZ4CompressingInputStream.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/compression/LZ4CompressingInputStream.java @@ -15,14 +15,12 @@ */ package com.palantir.common.compression; +import com.google.common.io.ByteStreams; +import com.palantir.logsafe.Preconditions; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.zip.Checksum; - -import com.google.common.io.ByteStreams; -import com.palantir.logsafe.Preconditions; - import net.jpountz.lz4.LZ4BlockOutputStream; import net.jpountz.lz4.LZ4Compressor; import net.jpountz.lz4.LZ4Factory; diff --git a/atlasdb-commons/src/main/java/com/palantir/common/concurrent/BlockingWorkerPool.java b/atlasdb-commons/src/main/java/com/palantir/common/concurrent/BlockingWorkerPool.java index a4306f153c1..61aa93b1594 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/concurrent/BlockingWorkerPool.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/concurrent/BlockingWorkerPool.java @@ -15,6 +15,7 @@ */ package com.palantir.common.concurrent; +import com.google.common.base.Throwables; import java.util.concurrent.CompletionService; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorCompletionService; @@ -22,8 +23,6 @@ import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicInteger; -import com.google.common.base.Throwables; - public class BlockingWorkerPool { private final CompletionService service; private final int concurrentTaskLimit; diff --git a/atlasdb-commons/src/main/java/com/palantir/common/concurrent/CoalescingSupplier.java b/atlasdb-commons/src/main/java/com/palantir/common/concurrent/CoalescingSupplier.java index 052bc06536d..6e3856a3d95 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/concurrent/CoalescingSupplier.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/concurrent/CoalescingSupplier.java @@ -15,14 +15,13 @@ */ package com.palantir.common.concurrent; +import com.google.common.base.Throwables; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Supplier; -import com.google.common.base.Throwables; - /** * A supplier that coalesces computation requests, such that only one computation is ever running at a time, and * concurrent requests will result in a single computation. Computations are guaranteed to execute after being diff --git a/atlasdb-commons/src/main/java/com/palantir/common/concurrent/InterruptibleFuture.java b/atlasdb-commons/src/main/java/com/palantir/common/concurrent/InterruptibleFuture.java index f822a2050e6..8a1f9fe996b 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/concurrent/InterruptibleFuture.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/concurrent/InterruptibleFuture.java @@ -15,6 +15,7 @@ */ package com.palantir.common.concurrent; +import com.palantir.common.base.Throwables; import java.util.concurrent.Callable; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; @@ -26,11 +27,8 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; - import javax.annotation.concurrent.GuardedBy; -import com.palantir.common.base.Throwables; - /** * A {@link RunnableFuture} whose {@code get} methods will never throw * {@link CancellationException} unless the task was never run. If diff --git a/atlasdb-commons/src/main/java/com/palantir/common/concurrent/MultiplexingCompletionService.java b/atlasdb-commons/src/main/java/com/palantir/common/concurrent/MultiplexingCompletionService.java index b66c98536d8..e12409adf01 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/concurrent/MultiplexingCompletionService.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/concurrent/MultiplexingCompletionService.java @@ -15,6 +15,9 @@ */ package com.palantir.common.concurrent; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; +import com.palantir.logsafe.exceptions.SafeIllegalStateException; import java.util.Map; import java.util.concurrent.BlockingQueue; import java.util.concurrent.Callable; @@ -25,10 +28,6 @@ import java.util.concurrent.RunnableFuture; import java.util.concurrent.TimeUnit; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; -import com.palantir.logsafe.exceptions.SafeIllegalStateException; - /** * A MultiplexingCompletionService is much like a {@link java.util.concurrent.ExecutorCompletionService}, but * supports multiple delegate {@link ExecutorService}s feeding in to a single shared {@link BlockingQueue}. diff --git a/atlasdb-commons/src/main/java/com/palantir/common/io/ConcatenatedInputStream.java b/atlasdb-commons/src/main/java/com/palantir/common/io/ConcatenatedInputStream.java index 4ebee5d6ba5..bdea0952da0 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/io/ConcatenatedInputStream.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/io/ConcatenatedInputStream.java @@ -15,12 +15,11 @@ */ package com.palantir.common.io; +import com.google.common.collect.Queues; import java.io.IOException; import java.io.InputStream; import java.util.Queue; -import com.google.common.collect.Queues; - public class ConcatenatedInputStream extends InputStream { private final Queue streams; diff --git a/atlasdb-commons/src/main/java/com/palantir/common/persist/Persistables.java b/atlasdb-commons/src/main/java/com/palantir/common/persist/Persistables.java index 293de7c81ce..ecdf3bd0937 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/persist/Persistables.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/persist/Persistables.java @@ -15,16 +15,15 @@ */ package com.palantir.common.persist; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.Collection; -import java.util.List; - import com.google.common.base.Function; import com.google.common.collect.Lists; import com.palantir.common.annotation.Output; import com.palantir.common.base.Throwables; import com.palantir.common.persist.Persistable.Hydrator; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.Collection; +import java.util.List; public class Persistables { @SuppressWarnings("unchecked") diff --git a/atlasdb-commons/src/main/java/com/palantir/common/pooling/AbstractPoolingContainer.java b/atlasdb-commons/src/main/java/com/palantir/common/pooling/AbstractPoolingContainer.java index 3cd5c977114..5abf124aa53 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/pooling/AbstractPoolingContainer.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/pooling/AbstractPoolingContainer.java @@ -15,21 +15,18 @@ */ package com.palantir.common.pooling; +import com.google.common.base.Function; +import com.palantir.common.base.FunctionCheckedException; +import com.palantir.common.collect.EmptyQueue; +import com.palantir.logsafe.Preconditions; import java.util.Queue; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicLong; - import javax.annotation.Nonnull; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Function; -import com.palantir.common.base.FunctionCheckedException; -import com.palantir.common.collect.EmptyQueue; -import com.palantir.logsafe.Preconditions; - /** * This class will pool resources up to the passedLimit. It will never block and instead will always allocate a new diff --git a/atlasdb-commons/src/main/java/com/palantir/common/proxy/DelayProxy.java b/atlasdb-commons/src/main/java/com/palantir/common/proxy/DelayProxy.java index 6f109e9a0b0..c2fb003c6b9 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/proxy/DelayProxy.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/proxy/DelayProxy.java @@ -15,14 +15,13 @@ */ package com.palantir.common.proxy; +import com.google.common.base.Suppliers; +import com.palantir.common.base.Throwables; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.function.Supplier; -import com.google.common.base.Suppliers; -import com.palantir.common.base.Throwables; - public class DelayProxy implements DelegatingInvocationHandler { @SuppressWarnings("unchecked") diff --git a/atlasdb-commons/src/main/java/com/palantir/common/proxy/InterruptibleProxy.java b/atlasdb-commons/src/main/java/com/palantir/common/proxy/InterruptibleProxy.java index c5a43769ec2..23070c77156 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/proxy/InterruptibleProxy.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/proxy/InterruptibleProxy.java @@ -15,6 +15,11 @@ */ package com.palantir.common.proxy; +import com.google.common.base.Suppliers; +import com.palantir.common.base.Throwables; +import com.palantir.common.concurrent.NamedThreadFactory; +import com.palantir.common.concurrent.PTExecutors; +import com.palantir.exception.PalantirInterruptedException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; @@ -23,12 +28,6 @@ import java.util.concurrent.Future; import java.util.function.Supplier; -import com.google.common.base.Suppliers; -import com.palantir.common.base.Throwables; -import com.palantir.common.concurrent.NamedThreadFactory; -import com.palantir.common.concurrent.PTExecutors; -import com.palantir.exception.PalantirInterruptedException; - /** * Proxy that calls the requested method in another thread waits on a Future. * If the calling thread is interrupted, this proxy will throw a PalantirInterruptedException. @@ -89,4 +88,3 @@ public Object getDelegate() { return delegate; } } - diff --git a/atlasdb-commons/src/main/java/com/palantir/common/proxy/MultiDelegateProxy.java b/atlasdb-commons/src/main/java/com/palantir/common/proxy/MultiDelegateProxy.java index d2ce19729b2..2a08c115fac 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/proxy/MultiDelegateProxy.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/proxy/MultiDelegateProxy.java @@ -15,20 +15,18 @@ */ package com.palantir.common.proxy; +import com.google.common.base.Suppliers; +import com.google.common.collect.ImmutableList; +import com.google.common.reflect.AbstractInvocationHandler; +import com.palantir.logsafe.Preconditions; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.Arrays; import java.util.function.Supplier; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Suppliers; -import com.google.common.collect.ImmutableList; -import com.google.common.reflect.AbstractInvocationHandler; -import com.palantir.logsafe.Preconditions; - /** * This class will delegate functionality and return the value (or throw the exception) of * one of the delegates. diff --git a/atlasdb-commons/src/main/java/com/palantir/common/proxy/SerializingProxy.java b/atlasdb-commons/src/main/java/com/palantir/common/proxy/SerializingProxy.java index aceb97201a8..4c2014d9df8 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/proxy/SerializingProxy.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/proxy/SerializingProxy.java @@ -15,15 +15,14 @@ */ package com.palantir.common.proxy; +import com.palantir.logsafe.Preconditions; +import com.palantir.util.ObjectInputStreamFactory; import java.io.NotSerializableException; import java.io.ObjectInputStream; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import com.palantir.logsafe.Preconditions; -import com.palantir.util.ObjectInputStreamFactory; - public class SerializingProxy implements DelegatingInvocationHandler { public static T newProxyInstance(Class interfaceClass, T delegate) { diff --git a/atlasdb-commons/src/main/java/com/palantir/common/proxy/SerializingUtils.java b/atlasdb-commons/src/main/java/com/palantir/common/proxy/SerializingUtils.java index 982071f5c0c..0d596d613c8 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/proxy/SerializingUtils.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/proxy/SerializingUtils.java @@ -15,17 +15,15 @@ */ package com.palantir.common.proxy; +import com.palantir.util.ByteArrayIOStream; +import com.palantir.util.ObjectInputStreamFactory; import java.io.Closeable; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.palantir.util.ByteArrayIOStream; -import com.palantir.util.ObjectInputStreamFactory; - public class SerializingUtils { protected static final Logger log = LoggerFactory.getLogger(SerializingUtils.class); diff --git a/atlasdb-commons/src/main/java/com/palantir/common/proxy/SingleCallProxy.java b/atlasdb-commons/src/main/java/com/palantir/common/proxy/SingleCallProxy.java index 99a46d8a14d..bb6bcde9e97 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/proxy/SingleCallProxy.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/proxy/SingleCallProxy.java @@ -15,13 +15,12 @@ */ package com.palantir.common.proxy; +import com.palantir.logsafe.exceptions.SafeIllegalStateException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.concurrent.atomic.AtomicBoolean; -import com.palantir.logsafe.exceptions.SafeIllegalStateException; - /** * Ensure that only a single method is ever called. Throw {@link IllegalStateException} on all subsequent calls. */ diff --git a/atlasdb-commons/src/main/java/com/palantir/common/proxy/TimingProxy.java b/atlasdb-commons/src/main/java/com/palantir/common/proxy/TimingProxy.java index 6723512f0f2..e7cedc13c72 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/proxy/TimingProxy.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/proxy/TimingProxy.java @@ -15,13 +15,12 @@ */ package com.palantir.common.proxy; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; - import com.palantir.logsafe.Preconditions; import com.palantir.util.jmx.OperationTimer; import com.palantir.util.jmx.OperationTimer.TimingState; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; public class TimingProxy implements DelegatingInvocationHandler { diff --git a/atlasdb-commons/src/main/java/com/palantir/common/random/SecureRandomPool.java b/atlasdb-commons/src/main/java/com/palantir/common/random/SecureRandomPool.java index 988a8f42897..cd645bd6222 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/random/SecureRandomPool.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/random/SecureRandomPool.java @@ -16,17 +16,15 @@ package com.palantir.common.random; +import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicLong; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; - public class SecureRandomPool { private static final Logger log = LoggerFactory.getLogger(SecureRandomPool.class); diff --git a/atlasdb-commons/src/main/java/com/palantir/common/remoting/HeaderAccessUtils.java b/atlasdb-commons/src/main/java/com/palantir/common/remoting/HeaderAccessUtils.java index 28707ecf23b..6ea6431623b 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/remoting/HeaderAccessUtils.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/remoting/HeaderAccessUtils.java @@ -15,11 +15,10 @@ */ package com.palantir.common.remoting; +import com.google.common.collect.ImmutableList; import java.util.Collection; import java.util.Map; -import com.google.common.collect.ImmutableList; - /** * This class is useful for accessing HTTP headers in a case-insensitive manner. * This is necessary for compatibility with OkHttp 3.3.0+, as that lower-cases header names whereas we use constants diff --git a/atlasdb-commons/src/main/java/com/palantir/common/remoting/ServiceNotAvailableException.java b/atlasdb-commons/src/main/java/com/palantir/common/remoting/ServiceNotAvailableException.java index 60966902334..c6c268d8ee9 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/remoting/ServiceNotAvailableException.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/remoting/ServiceNotAvailableException.java @@ -15,9 +15,8 @@ */ package com.palantir.common.remoting; -import java.util.Optional; - import com.google.common.net.HostAndPort; +import java.util.Optional; /** * If a server is shutting down or cannot respond to a call for another reson this exception may be thrown. diff --git a/atlasdb-commons/src/main/java/com/palantir/common/time/NanoTime.java b/atlasdb-commons/src/main/java/com/palantir/common/time/NanoTime.java index e0deb380c8b..d97b21e02d6 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/time/NanoTime.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/time/NanoTime.java @@ -16,14 +16,12 @@ package com.palantir.common.time; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import java.time.Duration; import java.util.concurrent.locks.LockSupport; - import org.immutables.value.Value; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - @Value.Immutable @Value.Style(visibility = Value.Style.ImplementationVisibility.PACKAGE) public abstract class NanoTime implements Comparable { diff --git a/atlasdb-commons/src/main/java/com/palantir/exception/PalantirInterruptedException.java b/atlasdb-commons/src/main/java/com/palantir/exception/PalantirInterruptedException.java index 92629410bbf..e23afef3db2 100644 --- a/atlasdb-commons/src/main/java/com/palantir/exception/PalantirInterruptedException.java +++ b/atlasdb-commons/src/main/java/com/palantir/exception/PalantirInterruptedException.java @@ -42,4 +42,3 @@ public PalantirInterruptedException(String msg, Throwable n) { super(msg, n); } } - diff --git a/atlasdb-commons/src/main/java/com/palantir/exception/PalantirSqlException.java b/atlasdb-commons/src/main/java/com/palantir/exception/PalantirSqlException.java index 3aba04ea74b..8a8d7f22152 100644 --- a/atlasdb-commons/src/main/java/com/palantir/exception/PalantirSqlException.java +++ b/atlasdb-commons/src/main/java/com/palantir/exception/PalantirSqlException.java @@ -15,11 +15,10 @@ */ package com.palantir.exception; +import com.palantir.common.exception.PalantirRuntimeException; import java.sql.SQLException; import java.util.Optional; -import com.palantir.common.exception.PalantirRuntimeException; - /** * SQLExceptions are checked. However, generally speaking, we just want to propagate them. * Having a whole bunch of 'throws' and 'catch throws' is ugly & unnecessary. @@ -85,4 +84,3 @@ public static PalantirSqlException createForChaining(String msg) { return new PalantirSqlException(DO_NOT_SET_INITIAL_SQL_EXCEPTION.YES, msg); } } - diff --git a/atlasdb-commons/src/main/java/com/palantir/util/AggregatingVersionedSupplier.java b/atlasdb-commons/src/main/java/com/palantir/util/AggregatingVersionedSupplier.java index 4768d65d9e2..6eddd87cba6 100644 --- a/atlasdb-commons/src/main/java/com/palantir/util/AggregatingVersionedSupplier.java +++ b/atlasdb-commons/src/main/java/com/palantir/util/AggregatingVersionedSupplier.java @@ -15,6 +15,7 @@ */ package com.palantir.util; +import com.google.common.base.Suppliers; import java.util.Collection; import java.util.Comparator; import java.util.concurrent.ConcurrentHashMap; @@ -23,8 +24,6 @@ import java.util.function.Function; import java.util.function.Supplier; -import com.google.common.base.Suppliers; - public class AggregatingVersionedSupplier implements Supplier> { public static final long UNINITIALIZED_VERSION = 0L; diff --git a/atlasdb-commons/src/main/java/com/palantir/util/AssertUtils.java b/atlasdb-commons/src/main/java/com/palantir/util/AssertUtils.java index 81d4a14c8f6..9341bf56c0f 100644 --- a/atlasdb-commons/src/main/java/com/palantir/util/AssertUtils.java +++ b/atlasdb-commons/src/main/java/com/palantir/util/AssertUtils.java @@ -15,16 +15,14 @@ */ package com.palantir.util; +import com.google.common.collect.Sets; +import com.palantir.logsafe.exceptions.SafeRuntimeException; import java.util.Collection; import java.util.List; import java.util.Set; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.Sets; -import com.palantir.logsafe.exceptions.SafeRuntimeException; - public class AssertUtils { /** diff --git a/atlasdb-commons/src/main/java/com/palantir/util/CachedComposedSupplier.java b/atlasdb-commons/src/main/java/com/palantir/util/CachedComposedSupplier.java index 12637a206e9..865bca6b241 100644 --- a/atlasdb-commons/src/main/java/com/palantir/util/CachedComposedSupplier.java +++ b/atlasdb-commons/src/main/java/com/palantir/util/CachedComposedSupplier.java @@ -15,14 +15,13 @@ */ package com.palantir.util; +import com.palantir.common.time.Clock; +import com.palantir.common.time.SystemClock; import java.util.Objects; import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.function.Supplier; -import com.palantir.common.time.Clock; -import com.palantir.common.time.SystemClock; - /** * A version of composed supplier that caches the result of applying the function to the value supplied by the * underlying supplier of {@link VersionedType}. The result is recomputed if and only if the returned version diff --git a/atlasdb-commons/src/main/java/com/palantir/util/JMXUtils.java b/atlasdb-commons/src/main/java/com/palantir/util/JMXUtils.java index 45cfca58545..1cff2bc65f1 100644 --- a/atlasdb-commons/src/main/java/com/palantir/util/JMXUtils.java +++ b/atlasdb-commons/src/main/java/com/palantir/util/JMXUtils.java @@ -15,6 +15,8 @@ */ package com.palantir.util; +import com.google.common.collect.Collections2; +import com.palantir.logsafe.exceptions.SafeIllegalStateException; import java.io.IOException; import java.lang.management.ManagementFactory; import java.lang.ref.ReferenceQueue; @@ -26,7 +28,6 @@ import java.rmi.RemoteException; import java.rmi.registry.LocateRegistry; import java.rmi.server.RMISocketFactory; - import javax.management.Attribute; import javax.management.AttributeList; import javax.management.AttributeNotFoundException; @@ -47,13 +48,9 @@ import javax.management.remote.JMXConnectorServer; import javax.management.remote.JMXConnectorServerFactory; import javax.management.remote.JMXServiceURL; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.Collections2; -import com.palantir.logsafe.exceptions.SafeIllegalStateException; - /** */ public final class JMXUtils { diff --git a/atlasdb-commons/src/main/java/com/palantir/util/MutuallyExclusiveSetLock.java b/atlasdb-commons/src/main/java/com/palantir/util/MutuallyExclusiveSetLock.java index ae46357b0d3..7968bafffff 100644 --- a/atlasdb-commons/src/main/java/com/palantir/util/MutuallyExclusiveSetLock.java +++ b/atlasdb-commons/src/main/java/com/palantir/util/MutuallyExclusiveSetLock.java @@ -15,16 +15,6 @@ */ package com.palantir.util; -import java.util.Collection; -import java.util.Comparator; -import java.util.List; -import java.util.Set; -import java.util.SortedMap; -import java.util.SortedSet; -import java.util.TreeMap; -import java.util.TreeSet; -import java.util.concurrent.locks.ReentrantLock; - import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -34,6 +24,15 @@ import com.google.common.collect.Sets; import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.util.Collection; +import java.util.Comparator; +import java.util.List; +import java.util.Set; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.concurrent.locks.ReentrantLock; /** diff --git a/atlasdb-commons/src/main/java/com/palantir/util/OptionalResolver.java b/atlasdb-commons/src/main/java/com/palantir/util/OptionalResolver.java index 9ddbe811aa2..bc334e37a3a 100644 --- a/atlasdb-commons/src/main/java/com/palantir/util/OptionalResolver.java +++ b/atlasdb-commons/src/main/java/com/palantir/util/OptionalResolver.java @@ -15,15 +15,14 @@ */ package com.palantir.util; +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; - public final class OptionalResolver { private OptionalResolver() { // Utility class diff --git a/atlasdb-commons/src/main/java/com/palantir/util/Pair.java b/atlasdb-commons/src/main/java/com/palantir/util/Pair.java index 7843bf808fc..603491ec9da 100644 --- a/atlasdb-commons/src/main/java/com/palantir/util/Pair.java +++ b/atlasdb-commons/src/main/java/com/palantir/util/Pair.java @@ -15,14 +15,12 @@ */ package com.palantir.util; -import java.io.Serializable; -import java.util.Comparator; - -import javax.annotation.concurrent.Immutable; - import com.google.common.base.Function; import com.google.common.collect.Ordering; import com.palantir.common.annotation.LongTermSerialized; +import java.io.Serializable; +import java.util.Comparator; +import javax.annotation.concurrent.Immutable; /** * A generic class for handling pairs of things. diff --git a/atlasdb-commons/src/main/java/com/palantir/util/PersistableBoolean.java b/atlasdb-commons/src/main/java/com/palantir/util/PersistableBoolean.java index 24a9e554dfe..b2b984282b8 100644 --- a/atlasdb-commons/src/main/java/com/palantir/util/PersistableBoolean.java +++ b/atlasdb-commons/src/main/java/com/palantir/util/PersistableBoolean.java @@ -15,9 +15,8 @@ */ package com.palantir.util; -import java.util.Arrays; - import com.palantir.common.persist.Persistable; +import java.util.Arrays; public enum PersistableBoolean implements Persistable { TRUE { diff --git a/atlasdb-commons/src/main/java/com/palantir/util/SoftCache.java b/atlasdb-commons/src/main/java/com/palantir/util/SoftCache.java index e0583e735bf..101b37bc385 100644 --- a/atlasdb-commons/src/main/java/com/palantir/util/SoftCache.java +++ b/atlasdb-commons/src/main/java/com/palantir/util/SoftCache.java @@ -15,6 +15,9 @@ */ package com.palantir.util; +import com.google.common.base.Predicate; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; @@ -28,14 +31,9 @@ import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.ConcurrentLinkedQueue; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Predicate; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; - /** * Thread Safe * diff --git a/atlasdb-commons/src/main/java/com/palantir/util/VersionedType.java b/atlasdb-commons/src/main/java/com/palantir/util/VersionedType.java index 8fd2f8ed599..f160f17771e 100644 --- a/atlasdb-commons/src/main/java/com/palantir/util/VersionedType.java +++ b/atlasdb-commons/src/main/java/com/palantir/util/VersionedType.java @@ -16,7 +16,6 @@ package com.palantir.util; import javax.annotation.Nullable; - import org.immutables.value.Value; @Value.Immutable diff --git a/atlasdb-commons/src/main/java/com/palantir/util/crypto/Sha256Hash.java b/atlasdb-commons/src/main/java/com/palantir/util/crypto/Sha256Hash.java index 58554c524fb..1ca6afd01e8 100644 --- a/atlasdb-commons/src/main/java/com/palantir/util/crypto/Sha256Hash.java +++ b/atlasdb-commons/src/main/java/com/palantir/util/crypto/Sha256Hash.java @@ -15,14 +15,6 @@ */ package com.palantir.util.crypto; -import java.io.IOException; -import java.io.InputStream; -import java.io.Serializable; -import java.security.DigestInputStream; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.Arrays; - import com.google.common.hash.HashCode; import com.google.common.hash.Hasher; import com.google.common.io.BaseEncoding; @@ -30,6 +22,13 @@ import com.google.common.primitives.UnsignedBytes; import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; +import java.io.IOException; +import java.io.InputStream; +import java.io.Serializable; +import java.security.DigestInputStream; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Arrays; /** * A SHA-256 hash. This class provides type-safety and equals/hashCode diff --git a/atlasdb-commons/src/main/java/com/palantir/util/debug/StackTraceUtils.java b/atlasdb-commons/src/main/java/com/palantir/util/debug/StackTraceUtils.java index 7592b09a2e2..f848877fba7 100644 --- a/atlasdb-commons/src/main/java/com/palantir/util/debug/StackTraceUtils.java +++ b/atlasdb-commons/src/main/java/com/palantir/util/debug/StackTraceUtils.java @@ -15,6 +15,7 @@ */ package com.palantir.util.debug; +import com.palantir.logsafe.exceptions.SafeIllegalStateException; import java.io.IOException; import java.io.Serializable; import java.lang.management.ManagementFactory; @@ -32,14 +33,11 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; - import javax.management.JMException; import javax.management.MBeanServerConnection; import javax.management.ObjectName; import javax.management.openmbean.CompositeData; -import com.palantir.logsafe.exceptions.SafeIllegalStateException; - @SuppressWarnings("checkstyle") // WARNING: This class was copied verbatim from an internal product. We are aware that the code quality is not great // and we lack tests, however this is covered by testing in the internal product diff --git a/atlasdb-commons/src/main/java/com/palantir/util/debug/ThreadDumps.java b/atlasdb-commons/src/main/java/com/palantir/util/debug/ThreadDumps.java index 5fa9181c909..cb00a95b429 100644 --- a/atlasdb-commons/src/main/java/com/palantir/util/debug/ThreadDumps.java +++ b/atlasdb-commons/src/main/java/com/palantir/util/debug/ThreadDumps.java @@ -19,7 +19,6 @@ import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; import java.lang.management.ThreadMXBean; - import javax.management.JMException; @SuppressWarnings("checkstyle") diff --git a/atlasdb-commons/src/main/java/com/palantir/util/file/DeleteOnCloseFileInputStream.java b/atlasdb-commons/src/main/java/com/palantir/util/file/DeleteOnCloseFileInputStream.java index 99e60a33351..6afb048b60f 100644 --- a/atlasdb-commons/src/main/java/com/palantir/util/file/DeleteOnCloseFileInputStream.java +++ b/atlasdb-commons/src/main/java/com/palantir/util/file/DeleteOnCloseFileInputStream.java @@ -19,7 +19,6 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/atlasdb-commons/src/main/java/com/palantir/util/file/TempFileUtils.java b/atlasdb-commons/src/main/java/com/palantir/util/file/TempFileUtils.java index d803cb8f6ea..295be76d60c 100644 --- a/atlasdb-commons/src/main/java/com/palantir/util/file/TempFileUtils.java +++ b/atlasdb-commons/src/main/java/com/palantir/util/file/TempFileUtils.java @@ -15,13 +15,12 @@ */ package com.palantir.util.file; +import com.google.common.io.BaseEncoding; +import com.palantir.logsafe.exceptions.SafeIoException; import java.io.File; import java.io.IOException; import java.util.Random; -import com.google.common.io.BaseEncoding; -import com.palantir.logsafe.exceptions.SafeIoException; - public final class TempFileUtils { private TempFileUtils() {/**/ } diff --git a/atlasdb-commons/src/main/java/com/palantir/util/paging/AbstractPagingIterable.java b/atlasdb-commons/src/main/java/com/palantir/util/paging/AbstractPagingIterable.java index 1a88aa780e3..46a841904e4 100644 --- a/atlasdb-commons/src/main/java/com/palantir/util/paging/AbstractPagingIterable.java +++ b/atlasdb-commons/src/main/java/com/palantir/util/paging/AbstractPagingIterable.java @@ -15,11 +15,10 @@ */ package com.palantir.util.paging; -import java.util.Iterator; - import com.google.common.collect.AbstractIterator; import com.palantir.common.base.Throwables; import com.palantir.logsafe.Preconditions; +import java.util.Iterator; /** * This class only requires two methods {@link #getFirstPage()} and diff --git a/atlasdb-commons/src/main/java/com/palantir/util/paging/PageDrainer.java b/atlasdb-commons/src/main/java/com/palantir/util/paging/PageDrainer.java index 59658431be3..4dfd6b9ec1b 100644 --- a/atlasdb-commons/src/main/java/com/palantir/util/paging/PageDrainer.java +++ b/atlasdb-commons/src/main/java/com/palantir/util/paging/PageDrainer.java @@ -15,10 +15,9 @@ */ package com.palantir.util.paging; -import java.util.List; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import java.util.List; public class PageDrainer { private final PageGetter pageGetter; @@ -43,4 +42,3 @@ private boolean hasNextPage(List currentPage) { return currentPage.size() >= pageGetter.getPageSize(); } } - diff --git a/atlasdb-commons/src/main/java/com/palantir/util/paging/SimpleResultsPage.java b/atlasdb-commons/src/main/java/com/palantir/util/paging/SimpleResultsPage.java index fea1417b1b4..3adebeca885 100644 --- a/atlasdb-commons/src/main/java/com/palantir/util/paging/SimpleResultsPage.java +++ b/atlasdb-commons/src/main/java/com/palantir/util/paging/SimpleResultsPage.java @@ -15,14 +15,12 @@ */ package com.palantir.util.paging; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; import java.io.Serializable; import java.util.Collections; - import javax.annotation.concurrent.Immutable; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; - /** * * Supplies a simple result page. diff --git a/atlasdb-commons/src/main/java/com/palantir/util/timer/LoggingOperationTimer.java b/atlasdb-commons/src/main/java/com/palantir/util/timer/LoggingOperationTimer.java index dc7f881ea97..9a28805a90b 100644 --- a/atlasdb-commons/src/main/java/com/palantir/util/timer/LoggingOperationTimer.java +++ b/atlasdb-commons/src/main/java/com/palantir/util/timer/LoggingOperationTimer.java @@ -15,11 +15,10 @@ */ package com.palantir.util.timer; +import com.palantir.util.jmx.OperationTimer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.palantir.util.jmx.OperationTimer; - public class LoggingOperationTimer implements OperationTimer { private final Logger delegate; diff --git a/atlasdb-commons/src/test/java/com/palantir/async/initializer/AsyncInitializerTest.java b/atlasdb-commons/src/test/java/com/palantir/async/initializer/AsyncInitializerTest.java index 890e49f6326..092c437dd88 100644 --- a/atlasdb-commons/src/test/java/com/palantir/async/initializer/AsyncInitializerTest.java +++ b/atlasdb-commons/src/test/java/com/palantir/async/initializer/AsyncInitializerTest.java @@ -27,7 +27,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; - import org.jmock.lib.concurrent.DeterministicScheduler; import org.junit.Test; import org.mockito.Mockito; @@ -97,11 +96,11 @@ public void initializationAlwaysFailsAfterTheFirstSynchronousTry() { AlwaysFailingInitializer initializer = new AlwaysFailingInitializer(); assertThatThrownBy(() -> initializer.initialize(false)) - .isInstanceOf(RuntimeException.class) - .withFailMessage("Failed initializing"); + .withFailMessage("Failed initializing") + .isInstanceOf(RuntimeException.class); assertThatThrownBy(() -> initializer.initialize(false)) - .isInstanceOf(IllegalStateException.class) - .hasMessageContaining("Multiple calls tried to initialize the same instance."); + .hasMessageContaining("Multiple calls tried to initialize the same instance.") + .isInstanceOf(IllegalStateException.class); tickSchedulerFiveTimes(initializer); assertThat(initializer.initializationAttempts).isEqualTo(1); } @@ -112,8 +111,8 @@ public void initializationAlwaysFailsAfterTheFirstAsynchronousTry() { initializer.initialize(true); assertThatThrownBy(() -> initializer.initialize(false)) - .isInstanceOf(IllegalStateException.class) - .hasMessageContaining("Multiple calls tried to initialize the same instance."); + .hasMessageContaining("Multiple calls tried to initialize the same instance.") + .isInstanceOf(IllegalStateException.class); tickSchedulerFiveTimes(initializer); assertThat(initializer.initializationAttempts).isEqualTo(1 + FIVE); } diff --git a/atlasdb-commons/src/test/java/com/palantir/async/initializer/CallChainTest.java b/atlasdb-commons/src/test/java/com/palantir/async/initializer/CallChainTest.java index f9e9f8c6f1e..7a81b843dd2 100644 --- a/atlasdb-commons/src/test/java/com/palantir/async/initializer/CallChainTest.java +++ b/atlasdb-commons/src/test/java/com/palantir/async/initializer/CallChainTest.java @@ -20,21 +20,19 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyNoMoreInteractions; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.function.Supplier; import java.util.stream.Stream; - import org.immutables.value.Value; import org.junit.Test; import org.mockito.InOrder; import org.mockito.Mockito; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; - public class CallChainTest { private static final String TEST_STRING = "abc"; diff --git a/atlasdb-commons/src/test/java/com/palantir/async/initializer/CallbackTest.java b/atlasdb-commons/src/test/java/com/palantir/async/initializer/CallbackTest.java index 8c5206522d6..3edaf0342a9 100644 --- a/atlasdb-commons/src/test/java/com/palantir/async/initializer/CallbackTest.java +++ b/atlasdb-commons/src/test/java/com/palantir/async/initializer/CallbackTest.java @@ -19,15 +19,13 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.fail; +import com.palantir.common.concurrent.PTExecutors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; - import org.awaitility.Awaitility; import org.junit.Test; -import com.palantir.common.concurrent.PTExecutors; - public class CallbackTest { @Test public void runWithRetryStopsRetryingOnSuccess() { diff --git a/atlasdb-commons/src/test/java/com/palantir/common/base/BatchingVisitablesTest.java b/atlasdb-commons/src/test/java/com/palantir/common/base/BatchingVisitablesTest.java index eb5612dd5af..c5a8ac1f094 100644 --- a/atlasdb-commons/src/test/java/com/palantir/common/base/BatchingVisitablesTest.java +++ b/atlasdb-commons/src/test/java/com/palantir/common/base/BatchingVisitablesTest.java @@ -24,12 +24,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import java.util.List; - -import javax.annotation.Nullable; - -import org.junit.Test; - import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.base.Preconditions; @@ -44,6 +38,9 @@ import com.palantir.util.Mutables; import com.palantir.util.Pair; import com.palantir.util.paging.TokenBackedBasicResultsPage; +import java.util.List; +import javax.annotation.Nullable; +import org.junit.Test; @SuppressWarnings("Guava") // BatchingVisitables uses Guava. public class BatchingVisitablesTest { diff --git a/atlasdb-commons/src/test/java/com/palantir/common/base/ThrowablesTest.java b/atlasdb-commons/src/test/java/com/palantir/common/base/ThrowablesTest.java index b4bd9da4d09..65846ee910f 100644 --- a/atlasdb-commons/src/test/java/com/palantir/common/base/ThrowablesTest.java +++ b/atlasdb-commons/src/test/java/com/palantir/common/base/ThrowablesTest.java @@ -17,7 +17,6 @@ import java.io.IOException; import java.sql.SQLException; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/atlasdb-commons/src/test/java/com/palantir/common/collect/IterableViewTest.java b/atlasdb-commons/src/test/java/com/palantir/common/collect/IterableViewTest.java index 7387887dd17..b639fcadab2 100644 --- a/atlasdb-commons/src/test/java/com/palantir/common/collect/IterableViewTest.java +++ b/atlasdb-commons/src/test/java/com/palantir/common/collect/IterableViewTest.java @@ -18,16 +18,14 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.util.List; -import java.util.Spliterator; -import java.util.stream.StreamSupport; - -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Iterables; +import java.util.List; +import java.util.Spliterator; +import java.util.stream.StreamSupport; +import org.junit.Test; public class IterableViewTest { diff --git a/atlasdb-commons/src/test/java/com/palantir/common/compression/LZ4CompressionTests.java b/atlasdb-commons/src/test/java/com/palantir/common/compression/LZ4CompressionTests.java index 76f10c7808d..0572a584fcc 100644 --- a/atlasdb-commons/src/test/java/com/palantir/common/compression/LZ4CompressionTests.java +++ b/atlasdb-commons/src/test/java/com/palantir/common/compression/LZ4CompressionTests.java @@ -18,19 +18,16 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; +import com.google.common.io.ByteStreams; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; import java.util.Random; - +import net.jpountz.lz4.LZ4BlockInputStream; import org.junit.After; import org.junit.Test; -import com.google.common.io.ByteStreams; - -import net.jpountz.lz4.LZ4BlockInputStream; - public class LZ4CompressionTests { private static final byte SINGLE_VALUE = 42; diff --git a/atlasdb-commons/src/test/java/com/palantir/common/concurrent/CoalescingSupplierTest.java b/atlasdb-commons/src/test/java/com/palantir/common/concurrent/CoalescingSupplierTest.java index df80fa0f831..9047f9025cf 100644 --- a/atlasdb-commons/src/test/java/com/palantir/common/concurrent/CoalescingSupplierTest.java +++ b/atlasdb-commons/src/test/java/com/palantir/common/concurrent/CoalescingSupplierTest.java @@ -26,6 +26,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import com.google.common.util.concurrent.Uninterruptibles; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; @@ -35,12 +36,9 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.IntStream; - import org.junit.Before; import org.junit.Test; -import com.google.common.util.concurrent.Uninterruptibles; - public class CoalescingSupplierTest { private static final int DEFAULT_VALUE = 123; diff --git a/atlasdb-commons/src/test/java/com/palantir/common/concurrent/InterruptibleFutureTest.java b/atlasdb-commons/src/test/java/com/palantir/common/concurrent/InterruptibleFutureTest.java index a4265dbcd0d..dc0ca998965 100644 --- a/atlasdb-commons/src/test/java/com/palantir/common/concurrent/InterruptibleFutureTest.java +++ b/atlasdb-commons/src/test/java/com/palantir/common/concurrent/InterruptibleFutureTest.java @@ -26,7 +26,6 @@ import java.util.concurrent.RunnableFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; - import org.hamcrest.Matchers; import org.junit.After; import org.junit.Before; diff --git a/atlasdb-commons/src/test/java/com/palantir/common/concurrent/MultiplexingCompletionServiceTest.java b/atlasdb-commons/src/test/java/com/palantir/common/concurrent/MultiplexingCompletionServiceTest.java index 74e581da230..8dbced24d7f 100644 --- a/atlasdb-commons/src/test/java/com/palantir/common/concurrent/MultiplexingCompletionServiceTest.java +++ b/atlasdb-commons/src/test/java/com/palantir/common/concurrent/MultiplexingCompletionServiceTest.java @@ -18,6 +18,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; @@ -26,14 +28,10 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; - import org.jmock.lib.concurrent.DeterministicScheduler; import org.junit.Before; import org.junit.Test; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; - public class MultiplexingCompletionServiceTest { private static final String KEY_1 = "key_1"; private static final String KEY_2 = "key_2"; diff --git a/atlasdb-commons/src/test/java/com/palantir/common/proxy/InterruptibleProxyTest.java b/atlasdb-commons/src/test/java/com/palantir/common/proxy/InterruptibleProxyTest.java index a98e144fe3f..263f1faaf5a 100644 --- a/atlasdb-commons/src/test/java/com/palantir/common/proxy/InterruptibleProxyTest.java +++ b/atlasdb-commons/src/test/java/com/palantir/common/proxy/InterruptibleProxyTest.java @@ -20,17 +20,15 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import com.palantir.common.exception.PalantirRuntimeException; +import com.palantir.exception.PalantirInterruptedException; import java.util.ArrayList; import java.util.List; import java.util.concurrent.BrokenBarrierException; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.atomic.AtomicBoolean; - import org.junit.Test; -import com.palantir.common.exception.PalantirRuntimeException; -import com.palantir.exception.PalantirInterruptedException; - public class InterruptibleProxyTest { @Test diff --git a/atlasdb-commons/src/test/java/com/palantir/common/time/NanoTimeTests.java b/atlasdb-commons/src/test/java/com/palantir/common/time/NanoTimeTests.java index 9e103ccce84..896e3f41f96 100644 --- a/atlasdb-commons/src/test/java/com/palantir/common/time/NanoTimeTests.java +++ b/atlasdb-commons/src/test/java/com/palantir/common/time/NanoTimeTests.java @@ -18,9 +18,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.Test; public final class NanoTimeTests { @@ -50,4 +49,3 @@ public void canBeSerializedAndDeserialized() throws Exception { assertThat(deserialized).isEqualTo(nanoTime); } } - diff --git a/atlasdb-commons/src/test/java/com/palantir/remoting/HeaderAccessUtilsTest.java b/atlasdb-commons/src/test/java/com/palantir/remoting/HeaderAccessUtilsTest.java index 65bedc4cc32..76e4dd81303 100644 --- a/atlasdb-commons/src/test/java/com/palantir/remoting/HeaderAccessUtilsTest.java +++ b/atlasdb-commons/src/test/java/com/palantir/remoting/HeaderAccessUtilsTest.java @@ -19,15 +19,13 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; -import java.util.Collection; -import java.util.Map; - -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.palantir.common.remoting.HeaderAccessUtils; +import java.util.Collection; +import java.util.Map; +import org.junit.Test; public class HeaderAccessUtilsTest { private static final String FOO = "foo"; diff --git a/atlasdb-commons/src/test/java/com/palantir/util/AggregatingVersionedSupplierTest.java b/atlasdb-commons/src/test/java/com/palantir/util/AggregatingVersionedSupplierTest.java index 7610c38a05d..25378de13ab 100644 --- a/atlasdb-commons/src/test/java/com/palantir/util/AggregatingVersionedSupplierTest.java +++ b/atlasdb-commons/src/test/java/com/palantir/util/AggregatingVersionedSupplierTest.java @@ -15,12 +15,10 @@ */ package com.palantir.util; -import static org.assertj.core.api.Assertions.assertThat; - import static com.palantir.util.AggregatingVersionedSupplier.UNINITIALIZED_VERSION; +import static org.assertj.core.api.Assertions.assertThat; import java.util.Comparator; - import org.junit.Before; import org.junit.Test; diff --git a/atlasdb-commons/src/test/java/com/palantir/util/AllAtlasCommonsTests.java b/atlasdb-commons/src/test/java/com/palantir/util/AllAtlasCommonsTests.java index d49995f37a3..bc92b4c2148 100644 --- a/atlasdb-commons/src/test/java/com/palantir/util/AllAtlasCommonsTests.java +++ b/atlasdb-commons/src/test/java/com/palantir/util/AllAtlasCommonsTests.java @@ -15,13 +15,12 @@ */ package com.palantir.util; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - import com.palantir.common.base.ThrowablesTest; import com.palantir.util.crypto.Sha256HashTest; import com.palantir.util.paging.PageDrainerTest; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) @SuiteClasses({ diff --git a/atlasdb-commons/src/test/java/com/palantir/util/CachedComposedSupplierTest.java b/atlasdb-commons/src/test/java/com/palantir/util/CachedComposedSupplierTest.java index ccf796d811a..c00e6c6001f 100644 --- a/atlasdb-commons/src/test/java/com/palantir/util/CachedComposedSupplierTest.java +++ b/atlasdb-commons/src/test/java/com/palantir/util/CachedComposedSupplierTest.java @@ -18,18 +18,16 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; +import com.palantir.common.concurrent.PTExecutors; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Supplier; - import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import com.palantir.common.concurrent.PTExecutors; - public class CachedComposedSupplierTest { private long counter; private long supplierCounter; @@ -118,11 +116,12 @@ public void appliesFunctionExactlyOncePerSuppliedValueChange() throws Interrupte assertThat(counter).isEqualTo(1 + supplierCounter / 100); } + @SuppressWarnings("ReturnValueIgnored") @Test public void recomputesIfSupplierHasNotUpdatedForTooLong() throws InterruptedException { AtomicLong clockCounter = new AtomicLong(); testSupplier = new CachedComposedSupplier<>(this::countingFunction, this::constantNumber, - 5, () -> clockCounter.get()); + 5, clockCounter::get); for (int i = 0; i < 25; i++) { clockCounter.incrementAndGet(); testSupplier.get(); diff --git a/atlasdb-commons/src/test/java/com/palantir/util/MutuallyExclusiveSetLockTest.java b/atlasdb-commons/src/test/java/com/palantir/util/MutuallyExclusiveSetLockTest.java index d9d5d75e1c6..380668aa8cd 100644 --- a/atlasdb-commons/src/test/java/com/palantir/util/MutuallyExclusiveSetLockTest.java +++ b/atlasdb-commons/src/test/java/com/palantir/util/MutuallyExclusiveSetLockTest.java @@ -15,16 +15,14 @@ */ package com.palantir.util; +import com.palantir.util.MutuallyExclusiveSetLock.LockState; import java.util.Arrays; import java.util.Collection; import java.util.List; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.palantir.util.MutuallyExclusiveSetLock.LockState; - public class MutuallyExclusiveSetLockTest { /** True iff test threads should release all their resources. */ volatile boolean unlock; diff --git a/atlasdb-commons/src/test/java/com/palantir/util/OptionalResolverTest.java b/atlasdb-commons/src/test/java/com/palantir/util/OptionalResolverTest.java index 91a6a466e9c..ff2444fb37a 100644 --- a/atlasdb-commons/src/test/java/com/palantir/util/OptionalResolverTest.java +++ b/atlasdb-commons/src/test/java/com/palantir/util/OptionalResolverTest.java @@ -19,7 +19,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.Optional; - import org.junit.Test; public class OptionalResolverTest { diff --git a/atlasdb-commons/src/test/java/com/palantir/util/crypto/Sha256HashTest.java b/atlasdb-commons/src/test/java/com/palantir/util/crypto/Sha256HashTest.java index 37c6a2656e7..c68b7dda1ca 100644 --- a/atlasdb-commons/src/test/java/com/palantir/util/crypto/Sha256HashTest.java +++ b/atlasdb-commons/src/test/java/com/palantir/util/crypto/Sha256HashTest.java @@ -15,14 +15,12 @@ */ package com.palantir.util.crypto; +import com.google.common.base.Charsets; +import com.google.common.io.BaseEncoding; import java.security.MessageDigest; - import org.junit.Assert; import org.junit.Test; -import com.google.common.base.Charsets; -import com.google.common.io.BaseEncoding; - public class Sha256HashTest { @Test diff --git a/atlasdb-commons/src/test/java/com/palantir/util/paging/PageDrainerTest.java b/atlasdb-commons/src/test/java/com/palantir/util/paging/PageDrainerTest.java index 125ca23332c..f1192a8eacc 100644 --- a/atlasdb-commons/src/test/java/com/palantir/util/paging/PageDrainerTest.java +++ b/atlasdb-commons/src/test/java/com/palantir/util/paging/PageDrainerTest.java @@ -16,16 +16,13 @@ package com.palantir.util.paging; import static java.lang.Math.min; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; -import java.util.List; - -import org.junit.Test; - import com.google.common.collect.Iterables; import com.google.common.collect.Lists; +import java.util.List; +import org.junit.Test; public class PageDrainerTest { private static final int PAGE_SIZE = 10; diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfig.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfig.java index 25e84b7ec5c..35108cc4c55 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfig.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfig.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.config; -import java.util.Optional; - -import javax.annotation.Nullable; - -import org.immutables.value.Value; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -36,6 +28,11 @@ import com.palantir.atlasdb.sweep.queue.config.TargetedSweepInstallConfig; import com.palantir.exception.NotInitializedException; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.util.Optional; +import javax.annotation.Nullable; +import org.immutables.value.Value; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @JsonDeserialize(as = ImmutableAtlasDbConfig.class) @JsonSerialize(as = ImmutableAtlasDbConfig.class) diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfigs.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfigs.java index 1642eb42053..f7cf7dd22ff 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfigs.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfigs.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.config; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.Optional; -import java.util.function.Function; - -import javax.annotation.Nullable; - import com.fasterxml.jackson.core.JsonPointer; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -35,6 +27,12 @@ import com.palantir.config.crypto.jackson.JsonNodeStringReplacer; import com.palantir.config.crypto.jackson.JsonNodeVisitors; import com.palantir.conjure.java.api.config.ssl.SslConfiguration; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.Optional; +import java.util.function.Function; +import javax.annotation.Nullable; public final class AtlasDbConfigs { public static final String ATLASDB_CONFIG_OBJECT_PATH = "/atlasdb"; diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfig.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfig.java index bcbcf0ed362..f9d9241a938 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfig.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfig.java @@ -15,10 +15,6 @@ */ package com.palantir.atlasdb.config; -import java.util.Optional; - -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palantir.atlasdb.AtlasDbConstants; @@ -30,6 +26,8 @@ import com.palantir.atlasdb.sweep.queue.config.TargetedSweepRuntimeConfig; import com.palantir.atlasdb.transaction.ImmutableTransactionConfig; import com.palantir.atlasdb.transaction.TransactionConfig; +import java.util.Optional; +import org.immutables.value.Value; @JsonDeserialize(as = ImmutableAtlasDbRuntimeConfig.class) @JsonSerialize(as = ImmutableAtlasDbRuntimeConfig.class) diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/DiscoverableSubtypeResolver.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/DiscoverableSubtypeResolver.java index 55e296ebc61..9ab80d30d83 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/DiscoverableSubtypeResolver.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/DiscoverableSubtypeResolver.java @@ -16,6 +16,8 @@ */ package com.palantir.atlasdb.config; +import com.fasterxml.jackson.databind.jsontype.impl.StdSubtypeResolver; +import com.google.common.collect.ImmutableList; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -25,13 +27,9 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.List; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.databind.jsontype.impl.StdSubtypeResolver; -import com.google.common.collect.ImmutableList; - /** * A Jackson subtype resolver which discovers subtypes via the META-INF/services directory * used by the {@link java.util.ServiceLoader}. diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/ShouldRunBackgroundSweepSupplier.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/ShouldRunBackgroundSweepSupplier.java index 25f240ade70..f667b6eb6ef 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/ShouldRunBackgroundSweepSupplier.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/ShouldRunBackgroundSweepSupplier.java @@ -16,13 +16,12 @@ package com.palantir.atlasdb.config; -import java.util.Optional; -import java.util.function.BooleanSupplier; -import java.util.function.Supplier; - import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.sweep.queue.config.TargetedSweepInstallConfig; import com.palantir.atlasdb.sweep.queue.config.TargetedSweepRuntimeConfig; +import java.util.Optional; +import java.util.function.BooleanSupplier; +import java.util.function.Supplier; /** * Synthesises provided install and runtime configurations, and uses this to decide whether the background sweeper diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/SweepConfig.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/SweepConfig.java index e7015bc636e..fb5583b4a3f 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/SweepConfig.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/SweepConfig.java @@ -15,15 +15,13 @@ */ package com.palantir.atlasdb.config; -import java.util.Optional; - -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.sweep.priority.SweepPriorityOverrideConfig; import com.palantir.logsafe.Preconditions; +import java.util.Optional; +import org.immutables.value.Value; @JsonDeserialize(as = ImmutableSweepConfig.class) @JsonSerialize(as = ImmutableSweepConfig.class) diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockClientConfig.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockClientConfig.java index 0da61f5abc4..8db090519e9 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockClientConfig.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockClientConfig.java @@ -15,15 +15,13 @@ */ package com.palantir.atlasdb.config; -import java.util.Optional; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.util.Optional; +import org.immutables.value.Value; @JsonSerialize(as = ImmutableTimeLockClientConfig.class) @JsonDeserialize(as = ImmutableTimeLockClientConfig.class) diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockRuntimeConfig.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockRuntimeConfig.java index 9efae77e579..3f2e66a91b7 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockRuntimeConfig.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockRuntimeConfig.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.config; -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.immutables.value.Value; @JsonSerialize(as = ImmutableTimeLockRuntimeConfig.class) @JsonDeserialize(as = ImmutableTimeLockRuntimeConfig.class) diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimestampClientConfig.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimestampClientConfig.java index 0a62dc272ba..e547d6520e9 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimestampClientConfig.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimestampClientConfig.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.config; -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.immutables.value.Value; @JsonSerialize(as = ImmutableTimestampClientConfig.class) @JsonDeserialize(as = ImmutableTimestampClientConfig.class) diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/DynamicDecoratingProxy.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/DynamicDecoratingProxy.java index e97e0f896da..755c6ff0226 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/DynamicDecoratingProxy.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/DynamicDecoratingProxy.java @@ -15,17 +15,15 @@ */ package com.palantir.atlasdb.factory; +import com.google.common.reflect.AbstractInvocationHandler; +import com.palantir.exception.NotInitializedException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.function.Supplier; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.reflect.AbstractInvocationHandler; -import com.palantir.exception.NotInitializedException; - public final class DynamicDecoratingProxy extends AbstractInvocationHandler { private final T decoratedService; private final T defaultService; diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/Leaders.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/Leaders.java index 9912f956cf2..76897402b29 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/Leaders.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/Leaders.java @@ -15,24 +15,6 @@ */ package com.palantir.atlasdb.factory; -import java.util.Collection; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.SynchronousQueue; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.function.Supplier; -import java.util.stream.Collectors; - -import org.immutables.value.Value; - import com.codahale.metrics.InstrumentedExecutorService; import com.codahale.metrics.MetricRegistry; import com.google.common.collect.ImmutableList; @@ -63,6 +45,22 @@ import com.palantir.paxos.PaxosLearnerImpl; import com.palantir.paxos.PaxosProposer; import com.palantir.paxos.PaxosProposerImpl; +import java.util.Collection; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.SynchronousQueue; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import org.immutables.value.Value; public final class Leaders { private Leaders() { diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/LocalOrRemoteProxy.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/LocalOrRemoteProxy.java index 9ac395285fe..bc0c31da81d 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/LocalOrRemoteProxy.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/LocalOrRemoteProxy.java @@ -15,6 +15,9 @@ */ package com.palantir.atlasdb.factory; +import com.google.common.reflect.AbstractInvocationHandler; +import com.google.common.util.concurrent.Uninterruptibles; +import com.palantir.leader.NotCurrentLeaderException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; @@ -23,10 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import com.google.common.reflect.AbstractInvocationHandler; -import com.google.common.util.concurrent.Uninterruptibles; -import com.palantir.leader.NotCurrentLeaderException; - /** * A proxy that chooses between using a local or remote proxy based on a task that may take a while to complete. */ diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceCreator.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceCreator.java index dd9b101dde4..e7d442451ce 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceCreator.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceCreator.java @@ -15,17 +15,6 @@ */ package com.palantir.atlasdb.factory; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.net.Proxy; -import java.net.ProxySelector; -import java.net.SocketAddress; -import java.net.URI; -import java.util.List; -import java.util.Optional; -import java.util.function.Function; -import java.util.function.Supplier; - import com.codahale.metrics.MetricRegistry; import com.google.common.collect.ImmutableList; import com.google.common.net.HostAndPort; @@ -38,6 +27,16 @@ import com.palantir.conjure.java.config.ssl.SslSocketFactories; import com.palantir.conjure.java.config.ssl.TrustContext; import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; +import java.io.IOException; +import java.net.InetSocketAddress; +import java.net.Proxy; +import java.net.ProxySelector; +import java.net.SocketAddress; +import java.net.URI; +import java.util.List; +import java.util.Optional; +import java.util.function.Function; +import java.util.function.Supplier; public final class ServiceCreator { private final MetricsManager metricsManager; diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java index d0daabe0c3d..ff6ea43569d 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java @@ -15,6 +15,18 @@ */ package com.palantir.atlasdb.factory; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Suppliers; +import com.palantir.atlasdb.config.LeaderConfig; +import com.palantir.atlasdb.keyvalue.api.KeyValueService; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.spi.AtlasDbFactory; +import com.palantir.atlasdb.spi.KeyValueServiceConfig; +import com.palantir.atlasdb.spi.KeyValueServiceRuntimeConfig; +import com.palantir.atlasdb.util.MetricsManager; +import com.palantir.timestamp.ManagedTimestampService; +import com.palantir.timestamp.TimestampStoreInvalidator; +import com.palantir.util.debug.ThreadDumps; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -28,23 +40,9 @@ import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.StreamSupport; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Suppliers; -import com.palantir.atlasdb.config.LeaderConfig; -import com.palantir.atlasdb.keyvalue.api.KeyValueService; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.atlasdb.spi.AtlasDbFactory; -import com.palantir.atlasdb.spi.KeyValueServiceConfig; -import com.palantir.atlasdb.spi.KeyValueServiceRuntimeConfig; -import com.palantir.atlasdb.util.MetricsManager; -import com.palantir.timestamp.ManagedTimestampService; -import com.palantir.timestamp.TimestampStoreInvalidator; -import com.palantir.util.debug.ThreadDumps; - public class ServiceDiscoveringAtlasSupplier { private static final Logger log = LoggerFactory.getLogger(ServiceDiscoveringAtlasSupplier.class); private static final ServiceLoader loader = ServiceLoader.load(AtlasDbFactory.class); diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java index 5273dfe6166..cb52d2c15cf 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java @@ -15,22 +15,6 @@ */ package com.palantir.atlasdb.factory; -import java.util.List; -import java.util.Optional; -import java.util.Set; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; -import java.util.function.Consumer; -import java.util.function.Supplier; -import java.util.function.ToLongFunction; -import java.util.stream.Collectors; - -import javax.ws.rs.ClientErrorException; - -import org.immutables.value.Value; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.codahale.metrics.MetricRegistry; import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.common.annotations.VisibleForTesting; @@ -160,6 +144,19 @@ import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry; import com.palantir.tritium.metrics.registry.TaggedMetricRegistry; import com.palantir.util.OptionalResolver; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; +import java.util.function.Supplier; +import java.util.function.ToLongFunction; +import java.util.stream.Collectors; +import javax.ws.rs.ClientErrorException; +import org.immutables.value.Value; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Value.Immutable @Value.Style(stagedBuilder = true) diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagersInitializer.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagersInitializer.java index be93cc04735..ac5e2385d9d 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagersInitializer.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagersInitializer.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.factory; -import java.util.Set; - import com.google.common.annotations.VisibleForTesting; import com.palantir.async.initializer.AsyncInitializer; import com.palantir.atlasdb.keyvalue.api.KeyValueService; @@ -25,6 +23,7 @@ import com.palantir.atlasdb.table.description.Schemas; import com.palantir.atlasdb.transaction.impl.TransactionTables; import com.palantir.common.annotation.Idempotent; +import java.util.Set; public final class TransactionManagersInitializer extends AsyncInitializer { diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/startup/ConsistencyCheckRunner.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/startup/ConsistencyCheckRunner.java index 23c7ce9d6d7..70778cd14d5 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/startup/ConsistencyCheckRunner.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/startup/ConsistencyCheckRunner.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.factory.startup; -import java.util.Comparator; -import java.util.List; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.palantir.async.initializer.Callback; @@ -30,6 +24,10 @@ import com.palantir.common.base.Throwables; import com.palantir.exception.NotInitializedException; import com.palantir.logsafe.exceptions.SafeRuntimeException; +import java.util.Comparator; +import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Executes multiple {@link TransactionManagerConsistencyCheck}s in sequence, aggregating the diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/startup/TimeLockMigrator.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/startup/TimeLockMigrator.java index cac0eb22eb4..4383dff3556 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/startup/TimeLockMigrator.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/startup/TimeLockMigrator.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.factory.startup; -import java.util.function.Supplier; - import com.palantir.async.initializer.AsyncInitializer; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.config.ServerListConfig; @@ -26,6 +24,7 @@ import com.palantir.common.exception.AtlasDbDependencyException; import com.palantir.timestamp.TimestampManagementService; import com.palantir.timestamp.TimestampStoreInvalidator; +import java.util.function.Supplier; @SuppressWarnings("FinalClass") public class TimeLockMigrator extends AsyncInitializer { @@ -98,4 +97,3 @@ protected String getInitializingClassName() { return TimeLockMigrator.class.getSimpleName(); } } - diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timelock/TimestampCorroboratingTimelockService.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timelock/TimestampCorroboratingTimelockService.java index 0dd2d34dc4a..07d61a6fc96 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timelock/TimestampCorroboratingTimelockService.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timelock/TimestampCorroboratingTimelockService.java @@ -16,14 +16,13 @@ package com.palantir.atlasdb.factory.timelock; -import java.util.concurrent.atomic.LongAccumulator; -import java.util.function.Supplier; -import java.util.function.ToLongFunction; - import com.palantir.lock.v2.AutoDelegate_TimelockService; import com.palantir.lock.v2.StartIdentifiedAtlasDbTransactionResponse; import com.palantir.lock.v2.TimelockService; import com.palantir.timestamp.TimestampRange; +import java.util.concurrent.atomic.LongAccumulator; +import java.util.function.Supplier; +import java.util.function.ToLongFunction; /** * A timelock service decorator for introducing runtime validity checks on received timestamps. diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timestamp/FreshTimestampSupplierAdapter.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timestamp/FreshTimestampSupplierAdapter.java index f5ba8f9d85f..03ab8a1e5b7 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timestamp/FreshTimestampSupplierAdapter.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timestamp/FreshTimestampSupplierAdapter.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.factory.timestamp; -import java.util.function.LongSupplier; - import com.palantir.exception.NotInitializedException; import com.palantir.logsafe.Preconditions; import com.palantir.timestamp.TimestampService; +import java.util.function.LongSupplier; public class FreshTimestampSupplierAdapter implements LongSupplier { private volatile TimestampService timestampService; diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpClients.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpClients.java index 6dc4295a416..1c29977c997 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpClients.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpClients.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.http; -import java.net.ProxySelector; -import java.util.Collection; -import java.util.Optional; -import java.util.function.Function; -import java.util.function.Supplier; - import com.codahale.metrics.MetricRegistry; import com.google.common.annotations.VisibleForTesting; import com.palantir.atlasdb.config.ServerListConfig; @@ -28,6 +22,11 @@ import com.palantir.conjure.java.api.config.service.ProxyConfiguration; import com.palantir.conjure.java.api.config.ssl.SslConfiguration; import com.palantir.conjure.java.config.ssl.TrustContext; +import java.net.ProxySelector; +import java.util.Collection; +import java.util.Optional; +import java.util.function.Function; +import java.util.function.Supplier; public final class AtlasDbHttpClients { private static final TargetFactory DEFAULT_TARGET_FACTORY = AtlasDbFeignTargetFactory.DEFAULT; diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolHandler.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolHandler.java index e3e71f0b2d7..179680d5571 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolHandler.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolHandler.java @@ -16,14 +16,11 @@ package com.palantir.atlasdb.http; +import com.palantir.conjure.java.api.errors.QosException; import java.util.function.Function; - import javax.ws.rs.core.Response; - import org.immutables.value.Value; -import com.palantir.conjure.java.api.errors.QosException; - interface AtlasDbHttpProtocolHandler { Response handleLegacyOrUnknownVersion(E underlyingException); diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/BlockingTimeoutExceptionMapper.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/BlockingTimeoutExceptionMapper.java index 1dae663c7fe..5571593755c 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/BlockingTimeoutExceptionMapper.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/BlockingTimeoutExceptionMapper.java @@ -15,12 +15,10 @@ */ package com.palantir.atlasdb.http; -import java.time.Duration; - -import javax.ws.rs.core.Response; - import com.palantir.conjure.java.api.errors.QosException; import com.palantir.lock.remoting.BlockingTimeoutException; +import java.time.Duration; +import javax.ws.rs.core.Response; /** * Converts {@link BlockingTimeoutException}s into appropriate status responses, depending on the user's diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/ExceptionMappers.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/ExceptionMappers.java index 52ef4297359..588a3b30124 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/ExceptionMappers.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/ExceptionMappers.java @@ -15,15 +15,13 @@ */ package com.palantir.atlasdb.http; +import com.palantir.remoting2.errors.SerializableError; import java.util.Arrays; import java.util.List; - import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import com.palantir.remoting2.errors.SerializableError; - public final class ExceptionMappers { private ExceptionMappers() { // utility diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/NotCurrentLeaderExceptionMapper.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/NotCurrentLeaderExceptionMapper.java index 9af29762c06..39e2fc155bd 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/NotCurrentLeaderExceptionMapper.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/NotCurrentLeaderExceptionMapper.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.http; -import javax.ws.rs.core.Response; - import com.palantir.conjure.java.api.errors.QosException; import com.palantir.leader.NotCurrentLeaderException; +import javax.ws.rs.core.Response; /** * Converts {@link NotCurrentLeaderException} into appropriate status responses depending on the user's diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/NotInitializedExceptionMapper.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/NotInitializedExceptionMapper.java index 9a89e5f5714..7447d9fbe90 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/NotInitializedExceptionMapper.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/NotInitializedExceptionMapper.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.http; -import javax.ws.rs.core.Response; - import com.palantir.conjure.java.api.errors.QosException; import com.palantir.exception.NotInitializedException; +import javax.ws.rs.core.Response; /** * Converts {@link NotInitializedException}s into appropriate status responses, depending on the user's diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/ProtocolAwareExceptionMapper.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/ProtocolAwareExceptionMapper.java index 4e1cd27ddc2..16a732b3bf0 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/ProtocolAwareExceptionMapper.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/ProtocolAwareExceptionMapper.java @@ -16,9 +16,14 @@ package com.palantir.atlasdb.http; +import com.google.common.annotations.VisibleForTesting; +import com.palantir.conjure.java.api.config.service.UserAgent; +import com.palantir.conjure.java.api.config.service.UserAgents; +import com.palantir.conjure.java.api.errors.QosException; +import com.palantir.logsafe.SafeArg; +import com.palantir.logsafe.exceptions.SafeIllegalStateException; import java.util.List; import java.util.Optional; - import javax.annotation.Nonnull; import javax.inject.Inject; import javax.inject.Provider; @@ -26,18 +31,10 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; - import org.glassfish.jersey.spi.ExceptionMappers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.annotations.VisibleForTesting; -import com.palantir.conjure.java.api.config.service.UserAgent; -import com.palantir.conjure.java.api.config.service.UserAgents; -import com.palantir.conjure.java.api.errors.QosException; -import com.palantir.logsafe.SafeArg; -import com.palantir.logsafe.exceptions.SafeIllegalStateException; - abstract class ProtocolAwareExceptionMapper implements ExceptionMapper { private static final Logger log = LoggerFactory.getLogger(ProtocolAwareExceptionMapper.class); diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigDeserializationTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigDeserializationTest.java index ff4a48c2317..f444f55139c 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigDeserializationTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigDeserializationTest.java @@ -17,15 +17,13 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.palantir.atlasdb.memory.InMemoryAtlasDbConfig; +import com.palantir.conjure.java.api.config.ssl.SslConfiguration; import java.io.File; import java.io.IOException; import java.nio.file.Paths; - import org.junit.Test; -import com.palantir.atlasdb.memory.InMemoryAtlasDbConfig; -import com.palantir.conjure.java.api.config.ssl.SslConfiguration; - public class AtlasDbConfigDeserializationTest { private static final File TEST_CONFIG_FILE = new File( AtlasDbConfigDeserializationTest.class.getResource("/test-config.yml").getPath()); diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigTest.java index 8cc37f2ea19..d5614dab391 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigTest.java @@ -26,14 +26,12 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.util.Optional; - -import org.junit.BeforeClass; -import org.junit.Test; - import com.palantir.atlasdb.memory.InMemoryAtlasDbConfig; import com.palantir.atlasdb.spi.KeyValueServiceConfig; import com.palantir.conjure.java.api.config.ssl.SslConfiguration; +import java.util.Optional; +import org.junit.BeforeClass; +import org.junit.Test; public class AtlasDbConfigTest { private static final KeyValueServiceConfig KVS_CONFIG_WITHOUT_NAMESPACE = mock(KeyValueServiceConfig.class); diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigsTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigsTest.java index 40ae2ac2961..05e8a35efb8 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigsTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigsTest.java @@ -17,6 +17,10 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.palantir.atlasdb.memory.InMemoryAsyncAtlasDbConfig; +import com.palantir.atlasdb.memory.InMemoryAtlasDbConfig; +import com.palantir.atlasdb.spi.KeyValueServiceConfig; +import com.palantir.config.crypto.KeyFileUtils; import java.io.File; import java.io.IOException; import java.net.URISyntaxException; @@ -24,16 +28,10 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import com.palantir.atlasdb.memory.InMemoryAsyncAtlasDbConfig; -import com.palantir.atlasdb.memory.InMemoryAtlasDbConfig; -import com.palantir.atlasdb.spi.KeyValueServiceConfig; -import com.palantir.config.crypto.KeyFileUtils; - public class AtlasDbConfigsTest { private static String previousKeyPathProperty; diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfigDeserializationTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfigDeserializationTest.java index 6478bc9a2ee..60107a35d2e 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfigDeserializationTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfigDeserializationTest.java @@ -17,14 +17,12 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.palantir.conjure.java.api.config.ssl.SslConfiguration; import java.io.File; import java.io.IOException; import java.nio.file.Paths; - import org.junit.Test; -import com.palantir.conjure.java.api.config.ssl.SslConfiguration; - public class AtlasDbRuntimeConfigDeserializationTest { private static final File TEST_RUNTIME_CONFIG_FILE = new File( AtlasDbRuntimeConfigDeserializationTest.class.getResource("/runtime-config-block.yml").getPath()); diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfigTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfigTest.java index 13207bd25f1..6134ff8316b 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfigTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfigTest.java @@ -17,9 +17,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.palantir.atlasdb.stream.StreamStorePersistenceConfiguration; +import org.junit.Test; public class AtlasDbRuntimeConfigTest { @Test diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/ServerListConfigsTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/ServerListConfigsTest.java index f3c659bed07..9730397c82b 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/ServerListConfigsTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/ServerListConfigsTest.java @@ -18,7 +18,6 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Optional; - import org.junit.Test; public class ServerListConfigsTest { diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/ShouldRunBackgroundSweepSupplierTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/ShouldRunBackgroundSweepSupplierTest.java index 6e89d6bd324..e75fb8bbba8 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/ShouldRunBackgroundSweepSupplierTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/ShouldRunBackgroundSweepSupplierTest.java @@ -20,14 +20,12 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.util.function.Supplier; - -import org.junit.Test; - import com.palantir.atlasdb.sweep.queue.config.ImmutableTargetedSweepInstallConfig; import com.palantir.atlasdb.sweep.queue.config.ImmutableTargetedSweepRuntimeConfig; import com.palantir.atlasdb.sweep.queue.config.TargetedSweepInstallConfig; import com.palantir.atlasdb.sweep.queue.config.TargetedSweepRuntimeConfig; +import java.util.function.Supplier; +import org.junit.Test; public class ShouldRunBackgroundSweepSupplierTest { private static final TargetedSweepInstallConfig SWEEP_QUEUE_WRITES_ENABLED diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/TimeLockClientConfigTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/TimeLockClientConfigTest.java index eb408592249..2cef41b0e1e 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/TimeLockClientConfigTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/TimeLockClientConfigTest.java @@ -22,14 +22,12 @@ import static org.junit.Assert.assertThat; import static org.mockito.Mockito.mock; +import com.google.common.collect.ImmutableList; +import com.palantir.conjure.java.api.config.ssl.SslConfiguration; import java.util.List; import java.util.Optional; - import org.junit.Test; -import com.google.common.collect.ImmutableList; -import com.palantir.conjure.java.api.config.ssl.SslConfiguration; - public class TimeLockClientConfigTest { private static final String CLIENT = "testClient"; private static final String SERVER_1 = "http://localhost:8080"; diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/AutoServiceAnnotatedAtlasDbFactory.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/AutoServiceAnnotatedAtlasDbFactory.java index 3dc12c5e190..a5683065f34 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/AutoServiceAnnotatedAtlasDbFactory.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/AutoServiceAnnotatedAtlasDbFactory.java @@ -15,16 +15,6 @@ */ package com.palantir.atlasdb.factory; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.function.LongSupplier; -import java.util.function.Supplier; - -import org.jmock.Mockery; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.auto.service.AutoService; import com.google.common.collect.Lists; import com.palantir.atlasdb.config.LeaderConfig; @@ -35,6 +25,14 @@ import com.palantir.atlasdb.spi.KeyValueServiceRuntimeConfig; import com.palantir.atlasdb.util.MetricsManager; import com.palantir.timestamp.ManagedTimestampService; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.function.LongSupplier; +import java.util.function.Supplier; +import org.jmock.Mockery; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @AutoService(AtlasDbFactory.class) public class AutoServiceAnnotatedAtlasDbFactory implements AtlasDbFactory { diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/DynamicDecoratingProxyTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/DynamicDecoratingProxyTest.java index ca5ab8fc0d7..8b1ea4a4b18 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/DynamicDecoratingProxyTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/DynamicDecoratingProxyTest.java @@ -20,12 +20,10 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import com.palantir.timestamp.TimestampService; import java.util.concurrent.atomic.AtomicBoolean; - import org.junit.Test; -import com.palantir.timestamp.TimestampService; - public class DynamicDecoratingProxyTest { private final TimestampService decorated = mock(TimestampService.class); private final TimestampService delegate = mock(TimestampService.class); diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/LeadersTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/LeadersTest.java index aee5ac2b34b..61705342b99 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/LeadersTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/LeadersTest.java @@ -23,14 +23,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import java.math.BigInteger; -import java.util.List; -import java.util.Optional; -import java.util.Set; - -import org.hamcrest.MatcherAssert; -import org.junit.Test; - import com.codahale.metrics.MetricRegistry; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; @@ -38,6 +30,12 @@ import com.palantir.paxos.PaxosAcceptor; import com.palantir.paxos.PaxosLearner; import com.palantir.paxos.PaxosValue; +import java.math.BigInteger; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import org.hamcrest.MatcherAssert; +import org.junit.Test; public class LeadersTest { diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplierTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplierTest.java index aa5d623dc4e..d7ae9904d9b 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplierTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplierTest.java @@ -19,13 +19,6 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; import static org.mockito.Mockito.mock; -import java.io.IOException; -import java.util.Optional; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.config.LeaderConfig; import com.palantir.atlasdb.spi.AtlasDbFactory; @@ -34,6 +27,11 @@ import com.palantir.atlasdb.util.MetricsManager; import com.palantir.atlasdb.util.MetricsManagers; import com.palantir.timestamp.ManagedTimestampService; +import java.io.IOException; +import java.util.Optional; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; public class ServiceDiscoveringAtlasSupplierTest { private final KeyValueServiceConfigHelper kvsConfig = () -> AutoServiceAnnotatedAtlasDbFactory.TYPE; diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/TransactionManagersTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/TransactionManagersTest.java index 3dc7a0c0dd6..6499b5d55e8 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/TransactionManagersTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/TransactionManagersTest.java @@ -15,6 +15,13 @@ */ package com.palantir.atlasdb.factory; +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.get; +import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor; +import static com.github.tomakehurst.wiremock.client.WireMock.post; +import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor; +import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; +import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.hamcrest.Matchers.equalTo; @@ -30,33 +37,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; -import static com.github.tomakehurst.wiremock.client.WireMock.get; -import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor; -import static com.github.tomakehurst.wiremock.client.WireMock.post; -import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor; -import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; -import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching; - -import java.io.IOException; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.UUID; -import java.util.concurrent.TimeUnit; -import java.util.function.Consumer; - -import javax.ws.rs.core.Response; - -import org.awaitility.Awaitility; -import org.junit.After; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; - import com.codahale.metrics.MetricRegistry; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -113,6 +93,22 @@ import com.palantir.timestamp.TimestampService; import com.palantir.timestamp.TimestampStoreInvalidator; import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry; +import java.io.IOException; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; +import javax.ws.rs.core.Response; +import org.awaitility.Awaitility; +import org.junit.After; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; public class TransactionManagersTest { private static final String CLIENT = "testClient"; diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/startup/ConsistencyCheckRunnerTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/startup/ConsistencyCheckRunnerTest.java index 13e668d132b..9afebd02345 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/startup/ConsistencyCheckRunnerTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/startup/ConsistencyCheckRunnerTest.java @@ -18,14 +18,13 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.mock; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.factory.ImmutableTransactionManagerConsistencyResult; import com.palantir.atlasdb.factory.TransactionManagerConsistencyResult; import com.palantir.atlasdb.transaction.api.TransactionManager; import com.palantir.atlasdb.transaction.impl.consistency.TransactionManagerConsistencyCheck; import com.palantir.exception.NotInitializedException; +import org.junit.Test; public class ConsistencyCheckRunnerTest { private static final RuntimeException EXCEPTION_1 = new RuntimeException("bad"); diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/startup/TimeLockMigratorTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/startup/TimeLockMigratorTest.java index 538d75c806b..b938a30ab05 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/startup/TimeLockMigratorTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/startup/TimeLockMigratorTest.java @@ -23,8 +23,10 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import com.palantir.common.exception.AtlasDbDependencyException; +import com.palantir.timestamp.TimestampManagementService; +import com.palantir.timestamp.TimestampStoreInvalidator; import java.util.concurrent.TimeUnit; - import org.awaitility.Awaitility; import org.junit.After; import org.junit.Before; @@ -33,10 +35,6 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import com.palantir.common.exception.AtlasDbDependencyException; -import com.palantir.timestamp.TimestampManagementService; -import com.palantir.timestamp.TimestampStoreInvalidator; - @RunWith(MockitoJUnitRunner.class) public class TimeLockMigratorTest { private static final long BACKUP_TIMESTAMP = 42; diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timelock/TimestampCorroboratingTimelockServiceTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timelock/TimestampCorroboratingTimelockServiceTest.java index 84bec5d350c..5627c31a0aa 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timelock/TimestampCorroboratingTimelockServiceTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timelock/TimestampCorroboratingTimelockServiceTest.java @@ -23,27 +23,29 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.palantir.lock.v2.LockImmutableTimestampResponse; +import com.palantir.lock.v2.LockToken; +import com.palantir.lock.v2.StartIdentifiedAtlasDbTransactionResponse; +import com.palantir.lock.v2.TimelockService; +import com.palantir.lock.v2.TimestampAndPartition; +import com.palantir.timestamp.TimestampRange; import java.util.UUID; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import java.util.concurrent.Future; - import org.junit.Before; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import com.palantir.lock.v2.LockImmutableTimestampResponse; -import com.palantir.lock.v2.LockToken; -import com.palantir.lock.v2.StartIdentifiedAtlasDbTransactionResponse; -import com.palantir.lock.v2.TimelockService; -import com.palantir.lock.v2.TimestampAndPartition; -import com.palantir.timestamp.TimestampRange; - public class TimestampCorroboratingTimelockServiceTest { private static final LockImmutableTimestampResponse LOCK_IMMUTABLE_TIMESTAMP_RESPONSE = LockImmutableTimestampResponse.of(1L, LockToken.of(UUID.randomUUID())); + private final ExecutorService executorService = Executors.newSingleThreadExecutor(); + private TimelockService rawTimelockService; private TimelockService timelockService; @@ -88,7 +90,7 @@ public void resilientUnderMultipleThreads() throws InterruptedException { .thenReturn(2L); Future blockingGetFreshTimestampCall = - CompletableFuture.runAsync(timelockService::getFreshTimestamp); + CompletableFuture.runAsync(timelockService::getFreshTimestamp, executorService); blockingTimestampReturning1.waitForFirstCallToBlock(); diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timestamp/FreshTimestampSupplierAdapterTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timestamp/FreshTimestampSupplierAdapterTest.java index e6fadabbb3a..74c8517bf51 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timestamp/FreshTimestampSupplierAdapterTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timestamp/FreshTimestampSupplierAdapterTest.java @@ -23,10 +23,9 @@ import static org.mockito.Mockito.when; import static org.mockito.internal.verification.VerificationModeFactory.times; -import org.junit.Test; - import com.palantir.exception.NotInitializedException; import com.palantir.timestamp.TimestampService; +import org.junit.Test; public class FreshTimestampSupplierAdapterTest { private final FreshTimestampSupplierAdapter adapter = new FreshTimestampSupplierAdapter(); diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/AtlasDbHttpClientsTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/AtlasDbHttpClientsTest.java index 56a63a699fd..30e9db12ce3 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/AtlasDbHttpClientsTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/AtlasDbHttpClientsTest.java @@ -15,35 +15,16 @@ */ package com.palantir.atlasdb.http; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; - import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching; - -import java.net.ProxySelector; -import java.util.List; -import java.util.Optional; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; - -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertThat; import com.codahale.metrics.MetricRegistry; import com.github.tomakehurst.wiremock.client.MappingBuilder; @@ -60,6 +41,21 @@ import com.palantir.conjure.java.api.config.service.ProxyConfiguration; import com.palantir.conjure.java.config.ssl.SslSocketFactories; import com.palantir.conjure.java.config.ssl.TrustContext; +import java.net.ProxySelector; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; public class AtlasDbHttpClientsTest { private static final Optional NO_SSL = Optional.empty(); diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolVersionTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolVersionTest.java index ae64f832d24..572d28efb64 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolVersionTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolVersionTest.java @@ -20,7 +20,6 @@ import java.util.Optional; import java.util.stream.Stream; - import org.junit.Test; public class AtlasDbHttpProtocolVersionTest { diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ExceptionMappersSerializationTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ExceptionMappersSerializationTest.java index e16862898b0..4d386bf3805 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ExceptionMappersSerializationTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ExceptionMappersSerializationTest.java @@ -17,18 +17,15 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.io.File; -import java.io.IOException; - -import javax.ws.rs.core.Response; - -import org.junit.Test; - import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.palantir.common.remoting.ServiceNotAvailableException; import com.palantir.conjure.java.serialization.ObjectMappers; import com.palantir.remoting2.errors.SerializableError; +import java.io.File; +import java.io.IOException; +import javax.ws.rs.core.Response; +import org.junit.Test; public class ExceptionMappersSerializationTest { private static final ObjectMapper MAPPER = ObjectMappers.newServerObjectMapper(); diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ExceptionMappersTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ExceptionMappersTest.java index 2c52d0dbeb4..5bf83e87786 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ExceptionMappersTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ExceptionMappersTest.java @@ -17,16 +17,14 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.google.common.collect.ImmutableList; +import com.google.common.net.HttpHeaders; +import com.palantir.remoting2.errors.SerializableError; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; - import org.apache.http.HttpStatus; import org.junit.Test; -import com.google.common.collect.ImmutableList; -import com.google.common.net.HttpHeaders; -import com.palantir.remoting2.errors.SerializableError; - public class ExceptionMappersTest { private static final Exception RUNTIME_EXCEPTION = new RuntimeException("foo"); private static final Response RESPONSE_503_WITHOUT_RETRY_AFTER diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ProtocolAwareExceptionMapperTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ProtocolAwareExceptionMapperTest.java index 03c75a31e2e..b1f3397816b 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ProtocolAwareExceptionMapperTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ProtocolAwareExceptionMapperTest.java @@ -18,11 +18,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.palantir.conjure.java.api.config.service.UserAgent; import com.palantir.conjure.java.api.config.service.UserAgents; +import org.junit.Test; public class ProtocolAwareExceptionMapperTest { private static final UserAgent USER_AGENT_1 = createBaseUserAgent("Bond", "0.0.7"); diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/keyvalue/impl/AsyncInitializeableInMemoryKvs.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/keyvalue/impl/AsyncInitializeableInMemoryKvs.java index ccfe4d249cc..3ade0eb5dec 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/keyvalue/impl/AsyncInitializeableInMemoryKvs.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/keyvalue/impl/AsyncInitializeableInMemoryKvs.java @@ -79,4 +79,3 @@ public boolean shouldTriggerCompactions() { return false; } } - diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/keyvalue/impl/AsyncInitializeableInMemoryKvsTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/keyvalue/impl/AsyncInitializeableInMemoryKvsTest.java index bac34d578d3..3202f2b2f58 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/keyvalue/impl/AsyncInitializeableInMemoryKvsTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/keyvalue/impl/AsyncInitializeableInMemoryKvsTest.java @@ -19,14 +19,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import com.palantir.atlasdb.keyvalue.api.KeyValueService; +import com.palantir.exception.NotInitializedException; import java.util.concurrent.TimeUnit; - import org.awaitility.Awaitility; import org.junit.Test; -import com.palantir.atlasdb.keyvalue.api.KeyValueService; -import com.palantir.exception.NotInitializedException; - public class AsyncInitializeableInMemoryKvsTest { @Test diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbConfig.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbConfig.java index 795741c4af3..0559d0f0afe 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbConfig.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbConfig.java @@ -15,14 +15,12 @@ */ package com.palantir.atlasdb.memory; -import java.util.Optional; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.auto.service.AutoService; import com.palantir.atlasdb.spi.KeyValueServiceConfig; +import java.util.Optional; +import org.immutables.value.Value; @JsonTypeName(InMemoryAsyncAtlasDbConfig.TYPE) @AutoService(KeyValueServiceConfig.class) diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactory.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactory.java index 87f2d3d75c8..f4533a8750a 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactory.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactory.java @@ -16,10 +16,6 @@ package com.palantir.atlasdb.memory; -import java.util.Optional; -import java.util.function.LongSupplier; -import java.util.function.Supplier; - import com.google.auto.service.AutoService; import com.palantir.atlasdb.config.LeaderConfig; import com.palantir.atlasdb.keyvalue.api.KeyValueService; @@ -33,6 +29,9 @@ import com.palantir.atlasdb.versions.AtlasDbVersion; import com.palantir.timestamp.InMemoryTimestampService; import com.palantir.timestamp.ManagedTimestampService; +import java.util.Optional; +import java.util.function.LongSupplier; +import java.util.function.Supplier; @AutoService(AtlasDbFactory.class) public class InMemoryAsyncAtlasDbFactory implements AtlasDbFactory { @@ -67,4 +66,3 @@ public ManagedTimestampService createManagedTimestampService( return new InMemoryTimestampService(); } } - diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactoryTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactoryTest.java index 1e061897cb5..a09c565916c 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactoryTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactoryTest.java @@ -19,16 +19,14 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import java.util.Optional; -import java.util.concurrent.TimeUnit; - -import org.awaitility.Awaitility; -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.spi.AtlasDbFactory; import com.palantir.exception.NotInitializedException; import com.palantir.timestamp.TimestampService; +import java.util.Optional; +import java.util.concurrent.TimeUnit; +import org.awaitility.Awaitility; +import org.junit.Test; public class InMemoryAsyncAtlasDbFactoryTest { private final AtlasDbFactory factory = new InMemoryAsyncAtlasDbFactory(); diff --git a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleBinder.java b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleBinder.java index 3aa0126efa5..b0080bebed5 100644 --- a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleBinder.java +++ b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleBinder.java @@ -15,18 +15,15 @@ */ package com.palantir.atlasdb.console; -import java.lang.reflect.Method; -import java.util.Map; - -import org.codehaus.groovy.runtime.MethodClosure; - import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Maps; import com.palantir.atlasdb.console.annotations.ConsoleBinding; - import groovy.lang.Binding; import groovy.lang.Closure; +import java.lang.reflect.Method; +import java.util.Map; +import org.codehaus.groovy.runtime.MethodClosure; public final class AtlasConsoleBinder { diff --git a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleJoins.java b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleJoins.java index 3330e6a70ed..7c651fafb3f 100644 --- a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleJoins.java +++ b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleJoins.java @@ -15,16 +15,15 @@ */ package com.palantir.atlasdb.console; +import com.google.common.collect.FluentIterable; +import com.google.common.collect.Iterables; +import com.google.common.collect.Maps; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.function.Function; import java.util.stream.Collectors; -import com.google.common.collect.FluentIterable; -import com.google.common.collect.Iterables; -import com.google.common.collect.Maps; - /** * Utility for joins. */ diff --git a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleMain.java b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleMain.java index 76ff8f130c5..b116b6a86ba 100644 --- a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleMain.java +++ b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleMain.java @@ -15,12 +15,17 @@ */ package com.palantir.atlasdb.console; +import com.google.common.base.Joiner; +import com.google.common.base.Preconditions; +import com.palantir.atlasdb.console.module.AtlasCoreModule; +import groovy.lang.Binding; +import groovy.lang.GroovyShell; +import groovy.lang.Script; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.GnuParser; @@ -31,14 +36,6 @@ import org.codehaus.groovy.control.CompilationFailedException; import org.codehaus.groovy.tools.shell.Main; -import com.google.common.base.Joiner; -import com.google.common.base.Preconditions; -import com.palantir.atlasdb.console.module.AtlasCoreModule; - -import groovy.lang.Binding; -import groovy.lang.GroovyShell; -import groovy.lang.Script; - public class AtlasConsoleMain { private static final String HELP_FLAG_SHORT = "h"; diff --git a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleModule.java b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleModule.java index ab1bf772df6..bb6a02fb87f 100644 --- a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleModule.java +++ b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleModule.java @@ -15,9 +15,8 @@ */ package com.palantir.atlasdb.console; -import java.util.Map; - import groovy.lang.Closure; +import java.util.Map; public interface AtlasConsoleModule { /** diff --git a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleService.java b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleService.java index d6069ba411f..5dd6ed1417c 100644 --- a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleService.java +++ b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleService.java @@ -15,9 +15,8 @@ */ package com.palantir.atlasdb.console; -import java.io.IOException; - import com.palantir.atlasdb.api.TransactionToken; +import java.io.IOException; public interface AtlasConsoleService { String tables() throws IOException; diff --git a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleServiceImpl.java b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleServiceImpl.java index 8ae1906de3e..b9740757d1a 100644 --- a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleServiceImpl.java +++ b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleServiceImpl.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.console; -import java.io.IOException; -import java.util.Set; - import com.fasterxml.jackson.databind.ObjectMapper; import com.palantir.atlasdb.api.AtlasDbService; import com.palantir.atlasdb.api.RangeToken; @@ -28,6 +25,8 @@ import com.palantir.atlasdb.api.TableRowSelection; import com.palantir.atlasdb.api.TransactionToken; import com.palantir.atlasdb.table.description.TableMetadata; +import java.io.IOException; +import java.util.Set; public class AtlasConsoleServiceImpl implements AtlasConsoleService { diff --git a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/DisconnectedAtlasConsoleService.java b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/DisconnectedAtlasConsoleService.java index 19f8df606c8..1e1c52ae692 100644 --- a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/DisconnectedAtlasConsoleService.java +++ b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/DisconnectedAtlasConsoleService.java @@ -15,9 +15,8 @@ */ package com.palantir.atlasdb.console; -import java.io.IOException; - import com.palantir.atlasdb.api.TransactionToken; +import java.io.IOException; public class DisconnectedAtlasConsoleService implements AtlasConsoleService { diff --git a/atlasdb-console/src/test/groovy/com/palantir/atlasdb/console/AtlasConsoleServiceTest.java b/atlasdb-console/src/test/groovy/com/palantir/atlasdb/console/AtlasConsoleServiceTest.java index e1c00a3c96c..bfb5b3d6e09 100644 --- a/atlasdb-console/src/test/groovy/com/palantir/atlasdb/console/AtlasConsoleServiceTest.java +++ b/atlasdb-console/src/test/groovy/com/palantir/atlasdb/console/AtlasConsoleServiceTest.java @@ -17,16 +17,6 @@ import static org.junit.Assert.assertEquals; -import java.io.IOException; -import java.util.HashSet; -import java.util.Set; - -import org.jmock.Expectations; -import org.jmock.Mockery; -import org.jmock.lib.legacy.ClassImposteriser; -import org.junit.Before; -import org.junit.Test; - import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -41,6 +31,14 @@ import com.palantir.atlasdb.api.TableRowSelection; import com.palantir.atlasdb.api.TransactionToken; import com.palantir.atlasdb.table.description.TableMetadata; +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; +import org.jmock.Expectations; +import org.jmock.Mockery; +import org.jmock.lib.legacy.ClassImposteriser; +import org.junit.Before; +import org.junit.Test; public class AtlasConsoleServiceTest { private final Mockery context = new Mockery(); diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraCliParser.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraCliParser.java index 0916fdfbfc3..c4c62bbda7e 100644 --- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraCliParser.java +++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraCliParser.java @@ -15,14 +15,12 @@ */ package com.palantir.atlasdb.containers; +import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; import java.util.regex.Matcher; import java.util.regex.Pattern; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; - public final class CassandraCliParser { private static final Logger log = LoggerFactory.getLogger(CassandraCliParser.class); diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraContainer.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraContainer.java index 1f0070b2cc6..25ef9bc87b2 100644 --- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraContainer.java +++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraContainer.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.containers; -import java.net.InetSocketAddress; -import java.util.Map; -import java.util.Optional; -import java.util.UUID; - import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; import com.palantir.atlasdb.cassandra.ImmutableCassandraCredentialsConfig; @@ -30,6 +25,10 @@ import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceImpl; import com.palantir.docker.compose.DockerComposeRule; import com.palantir.docker.compose.connection.waiting.SuccessOrFailure; +import java.net.InetSocketAddress; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; public class CassandraContainer extends Container { static final int CASSANDRA_PORT = 9160; diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraEnvironment.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraEnvironment.java index 4412ea48a3d..9a56979317d 100644 --- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraEnvironment.java +++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraEnvironment.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.containers; -import java.util.Map; - import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; +import java.util.Map; public final class CassandraEnvironment { public static final String CASSANDRA_VERSION = "CASSANDRA_VERSION"; diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraResource.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraResource.java index 89ec3ed95ac..7e69506b217 100644 --- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraResource.java +++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraResource.java @@ -16,13 +16,6 @@ package com.palantir.atlasdb.containers; -import java.util.Optional; -import java.util.function.Supplier; - -import org.junit.rules.ExternalResource; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService; @@ -31,6 +24,11 @@ import com.palantir.atlasdb.keyvalue.impl.TestResourceManager; import com.palantir.atlasdb.keyvalue.impl.TransactionManagerManager; import com.palantir.atlasdb.transaction.api.TransactionManager; +import java.util.Optional; +import java.util.function.Supplier; +import org.junit.rules.ExternalResource; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; public class CassandraResource extends ExternalResource implements KvsManager, TransactionManagerManager { private final CassandraContainer containerInstance = new CassandraContainer(); diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/Container.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/Container.java index e0f971f9e8d..c3303310300 100644 --- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/Container.java +++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/Container.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.containers; -import java.util.Map; - import com.google.common.collect.ImmutableMap; import com.palantir.docker.compose.DockerComposeRule; import com.palantir.docker.compose.connection.waiting.SuccessOrFailure; +import java.util.Map; public abstract class Container { public abstract String getDockerComposeFile(); diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/Containers.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/Containers.java index 5be2bf1b256..af542f3e08e 100644 --- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/Containers.java +++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/Containers.java @@ -15,20 +15,6 @@ */ package com.palantir.atlasdb.containers; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.nio.file.Paths; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -import org.apache.commons.io.IOUtils; -import org.awaitility.Awaitility; -import org.awaitility.Duration; -import org.junit.rules.ExternalResource; - import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Throwables; import com.google.common.cache.CacheBuilder; @@ -43,6 +29,18 @@ import com.palantir.docker.compose.logging.LogCollector; import com.palantir.docker.compose.logging.LogDirectory; import com.palantir.docker.proxy.DockerProxyRule; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.nio.file.Paths; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import org.apache.commons.io.IOUtils; +import org.awaitility.Awaitility; +import org.awaitility.Duration; +import org.junit.rules.ExternalResource; @SuppressWarnings("ShutdownHook") public class Containers extends ExternalResource { diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/InterruptibleFileLogCollector.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/InterruptibleFileLogCollector.java index 1865cf74a87..701b93dbd99 100644 --- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/InterruptibleFileLogCollector.java +++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/InterruptibleFileLogCollector.java @@ -15,6 +15,13 @@ */ package com.palantir.atlasdb.containers; +import com.palantir.docker.compose.connection.ContainerName; +import com.palantir.docker.compose.execution.DockerCompose; +import com.palantir.docker.compose.logging.FileLogCollector; +import com.palantir.docker.compose.logging.LogCollector; +import com.palantir.logsafe.Preconditions; +import com.palantir.logsafe.exceptions.SafeRuntimeException; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -22,20 +29,10 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; - import org.apache.commons.lang3.Validate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.palantir.docker.compose.connection.ContainerName; -import com.palantir.docker.compose.execution.DockerCompose; -import com.palantir.docker.compose.logging.FileLogCollector; -import com.palantir.docker.compose.logging.LogCollector; -import com.palantir.logsafe.Preconditions; -import com.palantir.logsafe.exceptions.SafeRuntimeException; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - @SuppressFBWarnings("SLF4J_ILLEGAL_PASSED_CLASS") public class InterruptibleFileLogCollector implements LogCollector { private static final Logger log = LoggerFactory.getLogger(FileLogCollector.class); diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraCluster.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraCluster.java index 169313c75c4..e9243c2b006 100644 --- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraCluster.java +++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraCluster.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.containers; -import java.net.InetSocketAddress; -import java.util.Map; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.palantir.atlasdb.cassandra.CassandraCredentialsConfig; import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; import com.palantir.atlasdb.cassandra.ImmutableCassandraCredentialsConfig; @@ -29,6 +23,10 @@ import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceImpl; import com.palantir.docker.compose.DockerComposeRule; import com.palantir.docker.compose.connection.waiting.SuccessOrFailure; +import java.net.InetSocketAddress; +import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ThreeNodeCassandraCluster extends Container { private static final Logger log = LoggerFactory.getLogger(ThreeNodeCassandraCluster.class); diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraClusterOperations.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraClusterOperations.java index 658d7bb3a9f..af95d905056 100644 --- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraClusterOperations.java +++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraClusterOperations.java @@ -15,15 +15,13 @@ */ package com.palantir.atlasdb.containers; -import java.io.IOException; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.ImmutableList; import com.palantir.docker.compose.DockerComposeRule; import com.palantir.docker.compose.execution.DockerComposeRunArgument; import com.palantir.docker.compose.execution.ImmutableDockerComposeRunOption; +import java.io.IOException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ThreeNodeCassandraClusterOperations { private static final Logger log = LoggerFactory.getLogger(ThreeNodeCassandraClusterOperations.class); diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraResource.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraResource.java index 5a6ccd848c7..9243cbd430f 100644 --- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraResource.java +++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraResource.java @@ -16,13 +16,6 @@ package com.palantir.atlasdb.containers; -import java.util.Optional; -import java.util.function.Supplier; - -import org.junit.rules.ExternalResource; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService; import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceImpl; @@ -30,6 +23,11 @@ import com.palantir.atlasdb.keyvalue.impl.TestResourceManager; import com.palantir.atlasdb.keyvalue.impl.TransactionManagerManager; import com.palantir.atlasdb.transaction.api.TransactionManager; +import java.util.Optional; +import java.util.function.Supplier; +import org.junit.rules.ExternalResource; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; public class ThreeNodeCassandraResource extends ExternalResource implements KvsManager, TransactionManagerManager { private final Supplier supplier; diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/UninitializedCassandraResource.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/UninitializedCassandraResource.java index 7355c2da0b3..7c756d97eb0 100644 --- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/UninitializedCassandraResource.java +++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/UninitializedCassandraResource.java @@ -16,11 +16,6 @@ package com.palantir.atlasdb.containers; -import java.io.IOException; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.junit.rules.ExternalResource; - import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceRuntimeConfig; import com.palantir.atlasdb.cassandra.CassandraMutationTimestampProviders; import com.palantir.atlasdb.keyvalue.api.KeyValueService; @@ -28,6 +23,9 @@ import com.palantir.atlasdb.util.MetricsManagers; import com.palantir.common.base.Throwables; import com.palantir.logsafe.Preconditions; +import java.io.IOException; +import java.util.concurrent.atomic.AtomicBoolean; +import org.junit.rules.ExternalResource; public class UninitializedCassandraResource extends ExternalResource { private final CassandraContainer containerInstance = CassandraContainer.throwawayContainer(); diff --git a/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/CassandraEnvironmentTest.java b/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/CassandraEnvironmentTest.java index 8d0648e98c6..069eb74c8c1 100644 --- a/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/CassandraEnvironmentTest.java +++ b/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/CassandraEnvironmentTest.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertThat; import java.util.Map; - import org.junit.Rule; import org.junit.Test; import org.junit.contrib.java.lang.system.EnvironmentVariables; diff --git a/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/ContainerTest.java b/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/ContainerTest.java index fbad775f263..1682056ad6e 100644 --- a/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/ContainerTest.java +++ b/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/ContainerTest.java @@ -19,7 +19,6 @@ import java.util.Arrays; import java.util.Collection; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/FirstNginxContainer.java b/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/FirstNginxContainer.java index 18d4a6ed1af..1c6fcc0246b 100644 --- a/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/FirstNginxContainer.java +++ b/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/FirstNginxContainer.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.containers; -import java.net.HttpURLConnection; -import java.net.URL; - import com.palantir.docker.compose.DockerComposeRule; import com.palantir.docker.compose.connection.waiting.SuccessOrFailure; +import java.net.HttpURLConnection; +import java.net.URL; public class FirstNginxContainer extends Container { @Override diff --git a/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/SecondNginxContainer.java b/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/SecondNginxContainer.java index 63f0438b742..d4ce355a5f2 100644 --- a/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/SecondNginxContainer.java +++ b/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/SecondNginxContainer.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.containers; -import java.net.HttpURLConnection; -import java.net.URL; - import com.palantir.docker.compose.DockerComposeRule; import com.palantir.docker.compose.connection.waiting.SuccessOrFailure; +import java.net.HttpURLConnection; +import java.net.URL; public class SecondNginxContainer extends Container { @Override diff --git a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationService.java b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationService.java index 2b566d1c175..db10ae40dc8 100644 --- a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationService.java +++ b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationService.java @@ -16,11 +16,10 @@ package com.palantir.atlasdb.coordination; +import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult; import java.util.Optional; import java.util.function.Function; -import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult; - /** * A {@link CoordinationService} is used to agree on values being relevant or correct at a given timestamp. * The sequence of values being agreed should evolve in a backwards consistent manner. This means that one should diff --git a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationServiceImpl.java b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationServiceImpl.java index 2b9fa4b07b0..32d2a2d1c67 100644 --- a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationServiceImpl.java +++ b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationServiceImpl.java @@ -16,18 +16,16 @@ package com.palantir.atlasdb.coordination; +import com.google.common.collect.Iterables; +import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult; +import com.palantir.logsafe.SafeArg; import java.util.Objects; import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.Iterables; -import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult; -import com.palantir.logsafe.SafeArg; - public class CoordinationServiceImpl implements CoordinationService { private static final Logger log = LoggerFactory.getLogger(CoordinationServiceImpl.class); diff --git a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationStore.java b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationStore.java index b44a1428c96..a60481107c9 100644 --- a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationStore.java +++ b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationStore.java @@ -16,11 +16,10 @@ package com.palantir.atlasdb.coordination; -import java.util.Optional; -import java.util.function.Function; - import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult; import com.palantir.processors.AutoDelegate; +import java.util.Optional; +import java.util.function.Function; /** * A {@link CoordinationStore} stores data that a {@link CoordinationService} may use. diff --git a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/SequenceAndBound.java b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/SequenceAndBound.java index 48037fe2d34..1431337d929 100644 --- a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/SequenceAndBound.java +++ b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/SequenceAndBound.java @@ -16,10 +16,9 @@ package com.palantir.atlasdb.coordination; -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.immutables.value.Value; /** * A pair of a sequence number and a bound on the validity of the value associated with that sequence number. diff --git a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/TransformingCoordinationService.java b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/TransformingCoordinationService.java index 4042c2fe374..25ea3120ce6 100644 --- a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/TransformingCoordinationService.java +++ b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/TransformingCoordinationService.java @@ -16,12 +16,11 @@ package com.palantir.atlasdb.coordination; +import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult; import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; -import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult; - /** * A {@link TransformingCoordinationService} is a {@link CoordinationService} for T2 objects that uses an underlying * {@link CoordinationService} for T1 objects. diff --git a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/ValueAndBound.java b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/ValueAndBound.java index 3134911c4a5..522abc258d9 100644 --- a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/ValueAndBound.java +++ b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/ValueAndBound.java @@ -17,7 +17,6 @@ package com.palantir.atlasdb.coordination; import java.util.Optional; - import org.immutables.value.Value; /** diff --git a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/keyvalue/KeyValueServiceCoordinationStore.java b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/keyvalue/KeyValueServiceCoordinationStore.java index 7782d79868d..bb17517ee2e 100644 --- a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/keyvalue/KeyValueServiceCoordinationStore.java +++ b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/keyvalue/KeyValueServiceCoordinationStore.java @@ -16,17 +16,6 @@ package com.palantir.atlasdb.coordination.keyvalue; -import java.io.IOException; -import java.util.Objects; -import java.util.Optional; -import java.util.function.BiPredicate; -import java.util.function.Function; -import java.util.function.LongSupplier; -import java.util.stream.Collectors; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; @@ -53,6 +42,15 @@ import com.palantir.atlasdb.table.description.ValueType; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.io.IOException; +import java.util.Objects; +import java.util.Optional; +import java.util.function.BiPredicate; +import java.util.function.Function; +import java.util.function.LongSupplier; +import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An implementation of {@link CoordinationStore} that persists its state in a {@link KeyValueService}. @@ -277,7 +275,6 @@ void putUnlessValueExists(long sequenceNumber, T value) { } catch (KeyAlreadyExistsException e) { throw new SafeIllegalStateException("The coordination store failed a putUnlessExists. This is unexpected" + " as it implies timestamps may have been reused, or a writer to the store behaved badly." - + " The offending sequence number was {}. " + " Please contact support - DO NOT ATTEMPT TO FIX THIS YOURSELF.", e, SafeArg.of("sequenceNumber", sequenceNumber)); @@ -378,7 +375,7 @@ private CheckAndSetResult getFailedResultWithMostRecentValueAn Optional oldValue, SequenceAndBound newValue) { Optional actualValue = getCoordinationValue(); if (!actualValue.isPresent()) { - throw new SafeIllegalStateException("Failed to check and set coordination value from {} to {}, but " + throw new SafeIllegalStateException("Failed to check and set coordination value, but " + "there is no value present in the coordination table", SafeArg.of("oldValue", oldValue), SafeArg.of("newValue", newValue)); } diff --git a/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/CoordinationServiceImplTest.java b/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/CoordinationServiceImplTest.java index a376fc88fa1..df00f421c36 100644 --- a/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/CoordinationServiceImplTest.java +++ b/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/CoordinationServiceImplTest.java @@ -24,10 +24,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.util.Optional; - -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.palantir.atlasdb.coordination.CoordinationService; @@ -35,6 +31,8 @@ import com.palantir.atlasdb.coordination.CoordinationStore; import com.palantir.atlasdb.coordination.ValueAndBound; import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult; +import java.util.Optional; +import org.junit.Test; public class CoordinationServiceImplTest { private static final String STRING = "string"; diff --git a/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/KeyValueServiceCoordinationStoreTest.java b/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/KeyValueServiceCoordinationStoreTest.java index 551422b25d6..c2e06da0599 100644 --- a/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/KeyValueServiceCoordinationStoreTest.java +++ b/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/KeyValueServiceCoordinationStoreTest.java @@ -27,12 +27,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.util.Optional; -import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Function; - -import org.junit.Test; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; @@ -52,6 +46,10 @@ import com.palantir.atlasdb.keyvalue.impl.ImmutableCheckAndSetResult; import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; import com.palantir.conjure.java.serialization.ObjectMappers; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Function; +import org.junit.Test; public class KeyValueServiceCoordinationStoreTest { private static final byte[] COORDINATION_ROW = PtBytes.toBytes("aaaaa"); diff --git a/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/TransformingCoordinationServiceTest.java b/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/TransformingCoordinationServiceTest.java index 9dda630419f..009efdec799 100644 --- a/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/TransformingCoordinationServiceTest.java +++ b/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/TransformingCoordinationServiceTest.java @@ -23,17 +23,15 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.util.Optional; -import java.util.function.Function; - -import org.junit.Before; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.coordination.CoordinationService; import com.palantir.atlasdb.coordination.TransformingCoordinationService; import com.palantir.atlasdb.coordination.ValueAndBound; import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult; +import java.util.Optional; +import java.util.function.Function; +import org.junit.Before; +import org.junit.Test; @SuppressWarnings("unchecked") // This test uses mocks liberally public class TransformingCoordinationServiceTest { diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/AtlasDbServices.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/AtlasDbServices.java index 694e0d78136..b076aa93ed2 100644 --- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/AtlasDbServices.java +++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/AtlasDbServices.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.services; -import javax.inject.Named; -import javax.inject.Singleton; - import com.palantir.atlasdb.config.AtlasDbConfig; import com.palantir.atlasdb.config.AtlasDbRuntimeConfig; import com.palantir.atlasdb.keyvalue.api.KeyValueService; @@ -27,8 +24,9 @@ import com.palantir.lock.LockService; import com.palantir.lock.v2.TimelockService; import com.palantir.timestamp.TimestampService; - import dagger.Component; +import javax.inject.Named; +import javax.inject.Singleton; @Singleton @Component(modules = { ServicesConfigModule.class, KeyValueServiceModule.class, RawKeyValueServiceModule.class, diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/KeyValueServiceModule.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/KeyValueServiceModule.java index 9a5e2b997b7..51a64d2cf4d 100644 --- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/KeyValueServiceModule.java +++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/KeyValueServiceModule.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.services; -import javax.inject.Named; -import javax.inject.Singleton; - import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.config.SweepConfig; import com.palantir.atlasdb.coordination.CoordinationService; @@ -44,9 +41,10 @@ import com.palantir.atlasdb.util.AtlasDbMetrics; import com.palantir.atlasdb.util.MetricsManager; import com.palantir.timestamp.TimestampService; - import dagger.Module; import dagger.Provides; +import javax.inject.Named; +import javax.inject.Singleton; @Module public class KeyValueServiceModule { diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/LockAndTimestampModule.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/LockAndTimestampModule.java index 269c586b903..c971912d249 100644 --- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/LockAndTimestampModule.java +++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/LockAndTimestampModule.java @@ -15,10 +15,6 @@ */ package com.palantir.atlasdb.services; -import java.util.function.Supplier; - -import javax.inject.Singleton; - import com.palantir.atlasdb.factory.ServiceDiscoveringAtlasSupplier; import com.palantir.atlasdb.factory.TransactionManagers; import com.palantir.atlasdb.util.MetricsManager; @@ -27,9 +23,10 @@ import com.palantir.lock.v2.TimelockService; import com.palantir.timestamp.ManagedTimestampService; import com.palantir.timestamp.TimestampService; - import dagger.Module; import dagger.Provides; +import java.util.function.Supplier; +import javax.inject.Singleton; @Module public class LockAndTimestampModule { diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/MetricsModule.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/MetricsModule.java index 691f4dc2241..acba7aabd1b 100644 --- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/MetricsModule.java +++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/MetricsModule.java @@ -15,15 +15,13 @@ */ package com.palantir.atlasdb.services; -import javax.inject.Singleton; - import com.codahale.metrics.MetricRegistry; import com.palantir.atlasdb.util.MetricsManager; import com.palantir.atlasdb.util.MetricsManagers; import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry; - import dagger.Module; import dagger.Provides; +import javax.inject.Singleton; @Module public class MetricsModule { diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/RawKeyValueServiceModule.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/RawKeyValueServiceModule.java index 08834fe8248..6b032059ccd 100644 --- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/RawKeyValueServiceModule.java +++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/RawKeyValueServiceModule.java @@ -15,14 +15,12 @@ */ package com.palantir.atlasdb.services; -import javax.inject.Named; -import javax.inject.Singleton; - import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.util.MetricsManager; - import dagger.Module; import dagger.Provides; +import javax.inject.Named; +import javax.inject.Singleton; @Module public class RawKeyValueServiceModule { diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfig.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfig.java index 35bbe226e9d..1c7b01b49fd 100644 --- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfig.java +++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfig.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.services; -import java.util.Optional; -import java.util.Set; - -import javax.net.ssl.SSLSocketFactory; - -import org.immutables.value.Value; - import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.config.AtlasDbConfig; import com.palantir.atlasdb.config.AtlasDbRuntimeConfig; @@ -29,6 +22,10 @@ import com.palantir.atlasdb.factory.timestamp.FreshTimestampSupplierAdapter; import com.palantir.atlasdb.table.description.Schema; import com.palantir.atlasdb.util.MetricsManager; +import java.util.Optional; +import java.util.Set; +import javax.net.ssl.SSLSocketFactory; +import org.immutables.value.Value; @Value.Immutable public abstract class ServicesConfig { diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfigModule.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfigModule.java index 61d3c201cf1..dfdcc8ae523 100644 --- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfigModule.java +++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfigModule.java @@ -15,17 +15,14 @@ */ package com.palantir.atlasdb.services; -import java.io.File; -import java.io.IOException; - -import javax.inject.Singleton; - import com.palantir.atlasdb.config.AtlasDbConfig; import com.palantir.atlasdb.config.AtlasDbConfigs; import com.palantir.atlasdb.config.AtlasDbRuntimeConfig; - import dagger.Module; import dagger.Provides; +import java.io.File; +import java.io.IOException; +import javax.inject.Singleton; @Module public class ServicesConfigModule { diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/SweeperModule.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/SweeperModule.java index e6ecf215437..7e276a82efb 100644 --- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/SweeperModule.java +++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/SweeperModule.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.services; -import javax.inject.Named; -import javax.inject.Singleton; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.cleaner.Follower; @@ -32,9 +29,10 @@ import com.palantir.atlasdb.transaction.impl.SweepStrategyManager; import com.palantir.atlasdb.transaction.service.TransactionService; import com.palantir.atlasdb.util.MetricsManager; - import dagger.Module; import dagger.Provides; +import javax.inject.Named; +import javax.inject.Singleton; @Module public class SweeperModule { diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/TransactionManagerModule.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/TransactionManagerModule.java index c96a6526e24..81dcad8521b 100644 --- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/TransactionManagerModule.java +++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/TransactionManagerModule.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.services; -import java.util.concurrent.Executors; - -import javax.inject.Named; -import javax.inject.Singleton; - import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.cache.DefaultTimestampCache; @@ -40,9 +35,11 @@ import com.palantir.common.concurrent.NamedThreadFactory; import com.palantir.lock.LockClient; import com.palantir.lock.v2.TimelockService; - import dagger.Module; import dagger.Provides; +import java.util.concurrent.Executors; +import javax.inject.Named; +import javax.inject.Singleton; @Module public class TransactionManagerModule { diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestAtlasDbServices.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestAtlasDbServices.java index e5909b0033a..0afcd8433f2 100644 --- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestAtlasDbServices.java +++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestAtlasDbServices.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.services.test; -import javax.inject.Singleton; - import com.palantir.atlasdb.services.AtlasDbServices; import com.palantir.atlasdb.services.KeyValueServiceModule; import com.palantir.atlasdb.services.LockAndTimestampModule; @@ -24,8 +22,8 @@ import com.palantir.atlasdb.services.RawKeyValueServiceModule; import com.palantir.atlasdb.services.ServicesConfigModule; import com.palantir.lock.LockClient; - import dagger.Component; +import javax.inject.Singleton; @Singleton @Component(modules = {ServicesConfigModule.class, KeyValueServiceModule.class, RawKeyValueServiceModule.class, diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestSweeperModule.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestSweeperModule.java index b6df80d46c2..c364be0771b 100644 --- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestSweeperModule.java +++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestSweeperModule.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.services.test; -import java.util.Optional; -import java.util.function.LongSupplier; - -import javax.inject.Named; -import javax.inject.Singleton; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.cleaner.Follower; @@ -36,9 +30,12 @@ import com.palantir.atlasdb.transaction.impl.SweepStrategyManager; import com.palantir.atlasdb.transaction.service.TransactionService; import com.palantir.atlasdb.util.MetricsManager; - import dagger.Module; import dagger.Provides; +import java.util.Optional; +import java.util.function.LongSupplier; +import javax.inject.Named; +import javax.inject.Singleton; @Module public class TestSweeperModule { diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestTransactionManagerModule.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestTransactionManagerModule.java index c05912f1cce..e03876a40d2 100644 --- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestTransactionManagerModule.java +++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestTransactionManagerModule.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.services.test; -import javax.inject.Named; -import javax.inject.Singleton; - import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.cache.DefaultTimestampCache; @@ -40,9 +37,10 @@ import com.palantir.lock.LockClient; import com.palantir.lock.LockService; import com.palantir.timestamp.TimestampService; - import dagger.Module; import dagger.Provides; +import javax.inject.Named; +import javax.inject.Singleton; @Module public class TestTransactionManagerModule { diff --git a/atlasdb-dagger/src/test/java/com/palantir/atlasdb/services/AtlasDbServicesTest.java b/atlasdb-dagger/src/test/java/com/palantir/atlasdb/services/AtlasDbServicesTest.java index 30e8e9261bd..ef2212a713a 100644 --- a/atlasdb-dagger/src/test/java/com/palantir/atlasdb/services/AtlasDbServicesTest.java +++ b/atlasdb-dagger/src/test/java/com/palantir/atlasdb/services/AtlasDbServicesTest.java @@ -15,17 +15,15 @@ */ package com.palantir.atlasdb.services; +import com.palantir.atlasdb.config.AtlasDbConfig; +import com.palantir.atlasdb.config.AtlasDbConfigs; +import com.palantir.atlasdb.config.AtlasDbRuntimeConfig; import java.io.File; import java.io.IOException; import java.net.URISyntaxException; import java.nio.file.Paths; - import org.junit.Test; -import com.palantir.atlasdb.config.AtlasDbConfig; -import com.palantir.atlasdb.config.AtlasDbConfigs; -import com.palantir.atlasdb.config.AtlasDbRuntimeConfig; - public class AtlasDbServicesTest { @Test diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/HikariCPConnectionManager.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/HikariCPConnectionManager.java index 73c43c9a967..35c468ed67b 100644 --- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/HikariCPConnectionManager.java +++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/HikariCPConnectionManager.java @@ -15,6 +15,15 @@ */ package com.palantir.nexus.db.pool; +import com.google.common.base.Stopwatch; +import com.palantir.logsafe.Preconditions; +import com.palantir.logsafe.exceptions.SafeRuntimeException; +import com.palantir.nexus.db.DBType; +import com.palantir.nexus.db.pool.config.ConnectionConfig; +import com.palantir.nexus.db.sql.ExceptionCheck; +import com.zaxxer.hikari.HikariDataSource; +import com.zaxxer.hikari.HikariPoolMXBean; +import com.zaxxer.hikari.pool.HikariPool.PoolInitializationException; import java.lang.management.ManagementFactory; import java.sql.Connection; import java.sql.ResultSet; @@ -23,27 +32,15 @@ import java.util.TimeZone; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; - import javax.management.JMX; import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Stopwatch; -import com.palantir.logsafe.Preconditions; -import com.palantir.logsafe.exceptions.SafeRuntimeException; -import com.palantir.nexus.db.DBType; -import com.palantir.nexus.db.pool.config.ConnectionConfig; -import com.palantir.nexus.db.sql.ExceptionCheck; -import com.zaxxer.hikari.HikariDataSource; -import com.zaxxer.hikari.HikariPoolMXBean; -import com.zaxxer.hikari.pool.HikariPool.PoolInitializationException; - /** * HikariCP Connection Manager. * diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorConnection.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorConnection.java index 697b00f5aa2..bb0e30528dd 100644 --- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorConnection.java +++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorConnection.java @@ -15,6 +15,9 @@ */ package com.palantir.nexus.db.pool; +import com.google.common.base.MoreObjects; +import com.google.common.collect.ImmutableMap; +import com.google.common.reflect.AbstractInvocationHandler; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -25,10 +28,6 @@ import java.sql.Statement; import java.util.Map; -import com.google.common.base.MoreObjects; -import com.google.common.collect.ImmutableMap; -import com.google.common.reflect.AbstractInvocationHandler; - /** * Allows you to intercept and override methods in {@link Connection}. */ diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorDataSource.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorDataSource.java index b181c55d893..88623ad13cc 100644 --- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorDataSource.java +++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorDataSource.java @@ -15,16 +15,14 @@ */ package com.palantir.nexus.db.pool; +import com.google.common.base.MoreObjects; +import com.google.common.reflect.AbstractInvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.sql.Connection; - import javax.sql.DataSource; -import com.google.common.base.MoreObjects; -import com.google.common.reflect.AbstractInvocationHandler; - /** * Allows you to intercept and override methods in {@link DataSource}. *

diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorStatement.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorStatement.java index 3dc669b34bd..64d7fdbfdfc 100644 --- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorStatement.java +++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorStatement.java @@ -15,6 +15,8 @@ */ package com.palantir.nexus.db.pool; +import com.google.common.base.MoreObjects; +import com.google.common.reflect.AbstractInvocationHandler; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -22,13 +24,9 @@ import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.MoreObjects; -import com.google.common.reflect.AbstractInvocationHandler; - /** * Allows you to intercept and override methods in {@link Statement} and subinterfaces * methods. diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/ConnectionConfig.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/ConnectionConfig.java index a92a76150af..2b095265d0b 100644 --- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/ConnectionConfig.java +++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/ConnectionConfig.java @@ -15,15 +15,6 @@ */ package com.palantir.nexus.db.pool.config; -import java.sql.Connection; -import java.util.Optional; -import java.util.Properties; -import java.util.concurrent.TimeUnit; - -import javax.sql.DataSource; - -import org.immutables.value.Value; - import com.codahale.metrics.SharedMetricRegistries; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -34,6 +25,12 @@ import com.palantir.nexus.db.pool.InterceptorDataSource; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.util.DriverDataSource; +import java.sql.Connection; +import java.util.Optional; +import java.util.Properties; +import java.util.concurrent.TimeUnit; +import javax.sql.DataSource; +import org.immutables.value.Value; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") @JsonSubTypes({ diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/H2ConnectionConfig.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/H2ConnectionConfig.java index 0a3ef4aae2a..6cfc114bf96 100644 --- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/H2ConnectionConfig.java +++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/H2ConnectionConfig.java @@ -15,15 +15,13 @@ */ package com.palantir.nexus.db.pool.config; -import java.util.Optional; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palantir.nexus.db.DBType; +import java.util.Optional; +import org.immutables.value.Value; @JsonDeserialize(as = ImmutableH2ConnectionConfig.class) @JsonSerialize(as = ImmutableH2ConnectionConfig.class) diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/MaskedValue.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/MaskedValue.java index 8756f28aacd..bc0ef6afd65 100644 --- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/MaskedValue.java +++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/MaskedValue.java @@ -15,10 +15,9 @@ */ package com.palantir.nexus.db.pool.config; -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.immutables.value.Value; @JsonDeserialize(as = ImmutableMaskedValue.class) @JsonSerialize(as = ImmutableMaskedValue.class) diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/OracleConnectionConfig.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/OracleConnectionConfig.java index 4c9c1e164ad..810249d492e 100644 --- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/OracleConnectionConfig.java +++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/OracleConnectionConfig.java @@ -15,14 +15,6 @@ */ package com.palantir.nexus.db.pool.config; -import java.io.File; -import java.util.Map; -import java.util.Optional; -import java.util.Properties; -import java.util.concurrent.TimeUnit; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -30,6 +22,12 @@ import com.google.common.collect.ImmutableMap; import com.palantir.logsafe.Preconditions; import com.palantir.nexus.db.DBType; +import java.io.File; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; +import java.util.concurrent.TimeUnit; +import org.immutables.value.Value; @JsonDeserialize(as = ImmutableOracleConnectionConfig.class) @JsonSerialize(as = ImmutableOracleConnectionConfig.class) diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/PostgresConnectionConfig.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/PostgresConnectionConfig.java index 869fbbf46f9..c684b7cb746 100644 --- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/PostgresConnectionConfig.java +++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/PostgresConnectionConfig.java @@ -15,18 +15,16 @@ */ package com.palantir.nexus.db.pool.config; -import java.util.Map; -import java.util.Optional; -import java.util.Properties; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.google.common.collect.ImmutableMap; import com.palantir.nexus.db.DBType; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; +import org.immutables.value.Value; @JsonDeserialize(as = ImmutablePostgresConnectionConfig.class) @JsonSerialize(as = ImmutablePostgresConnectionConfig.class) diff --git a/atlasdb-dbkvs-tests/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/AbstractDbKvsKeyValueServiceTest.java b/atlasdb-dbkvs-tests/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/AbstractDbKvsKeyValueServiceTest.java index eed89fd0641..ee6630f7e9d 100644 --- a/atlasdb-dbkvs-tests/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/AbstractDbKvsKeyValueServiceTest.java +++ b/atlasdb-dbkvs-tests/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/AbstractDbKvsKeyValueServiceTest.java @@ -17,15 +17,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.SortedMap; -import java.util.stream.Collectors; - -import org.junit.After; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -41,6 +32,13 @@ import com.palantir.atlasdb.keyvalue.impl.AbstractKeyValueServiceTest; import com.palantir.atlasdb.keyvalue.impl.KvsManager; import com.palantir.common.base.ClosableIterator; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.SortedMap; +import java.util.stream.Collectors; +import org.junit.After; +import org.junit.Test; public abstract class AbstractDbKvsKeyValueServiceTest extends AbstractKeyValueServiceTest { protected static final Namespace TEST_NAMESPACE = Namespace.create("ns"); diff --git a/atlasdb-dbkvs-tests/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKvsTestUtils.java b/atlasdb-dbkvs-tests/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKvsTestUtils.java index 2665511e0e4..b78c2f05d36 100644 --- a/atlasdb-dbkvs-tests/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKvsTestUtils.java +++ b/atlasdb-dbkvs-tests/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKvsTestUtils.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs; -import java.util.HashMap; -import java.util.Map; - import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.KeyValueService; @@ -25,6 +22,8 @@ import com.palantir.atlasdb.keyvalue.dbkvs.impl.ConnectionManagerAwareDbKvs; import com.palantir.atlasdb.keyvalue.dbkvs.impl.DbKvs; import com.palantir.atlasdb.transaction.service.TransactionService; +import java.util.HashMap; +import java.util.Map; public final class DbKvsTestUtils { private DbKvsTestUtils() { diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKvsSweepProgressStoreIntegrationTest.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKvsSweepProgressStoreIntegrationTest.java index d174fc3abeb..66ed8a2e86b 100644 --- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKvsSweepProgressStoreIntegrationTest.java +++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKvsSweepProgressStoreIntegrationTest.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs; -import org.junit.ClassRule; - import com.palantir.atlasdb.keyvalue.impl.TestResourceManager; import com.palantir.atlasdb.sweep.progress.AbstractSweepProgressStoreTest; +import org.junit.ClassRule; public class DbKvsSweepProgressStoreIntegrationTest extends AbstractSweepProgressStoreTest { @ClassRule diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresKeyValueServiceTest.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresKeyValueServiceTest.java index f3aa33e08c3..50861fb8c25 100644 --- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresKeyValueServiceTest.java +++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresKeyValueServiceTest.java @@ -15,16 +15,15 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs; -import org.apache.commons.lang3.StringUtils; -import org.junit.After; -import org.junit.ClassRule; -import org.junit.Test; - import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.dbkvs.impl.postgres.PostgresDdlTable; import com.palantir.atlasdb.keyvalue.impl.TestResourceManager; +import org.apache.commons.lang3.StringUtils; +import org.junit.After; +import org.junit.ClassRule; +import org.junit.Test; public class DbkvsPostgresKeyValueServiceTest extends AbstractDbKvsKeyValueServiceTest { @ClassRule diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresSerializableTransactionTest.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresSerializableTransactionTest.java index 1cf2c5d3b4b..74b206ab415 100644 --- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresSerializableTransactionTest.java +++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresSerializableTransactionTest.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs; -import org.junit.ClassRule; - import com.palantir.atlasdb.keyvalue.impl.TestResourceManager; import com.palantir.atlasdb.transaction.impl.AbstractSerializableTransactionTest; +import org.junit.ClassRule; public class DbkvsPostgresSerializableTransactionTest extends AbstractSerializableTransactionTest { @ClassRule diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresSweepTaskRunnerTest.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresSweepTaskRunnerTest.java index a42a38b9a6f..9776e0be31b 100644 --- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresSweepTaskRunnerTest.java +++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresSweepTaskRunnerTest.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs; -import org.junit.ClassRule; - import com.palantir.atlasdb.keyvalue.impl.TestResourceManager; import com.palantir.atlasdb.sweep.AbstractSweepTaskRunnerTest; +import org.junit.ClassRule; public class DbkvsPostgresSweepTaskRunnerTest extends AbstractSweepTaskRunnerTest { @ClassRule diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresTargetedSweepIntegrationTest.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresTargetedSweepIntegrationTest.java index 2579493c1a8..1634844c4e4 100644 --- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresTargetedSweepIntegrationTest.java +++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresTargetedSweepIntegrationTest.java @@ -16,10 +16,9 @@ package com.palantir.atlasdb.keyvalue.dbkvs; -import org.junit.ClassRule; - import com.palantir.atlasdb.keyvalue.impl.TestResourceManager; import com.palantir.atlasdb.sweep.AbstractTargetedSweepTest; +import org.junit.ClassRule; public class DbkvsPostgresTargetedSweepIntegrationTest extends AbstractTargetedSweepTest { @ClassRule diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresTestSuite.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresTestSuite.java index b3a083f1ec6..853deb4c1a7 100644 --- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresTestSuite.java +++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresTestSuite.java @@ -15,17 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs; -import java.net.InetSocketAddress; -import java.util.concurrent.Callable; - -import org.awaitility.Awaitility; -import org.awaitility.Duration; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - import com.palantir.atlasdb.keyvalue.dbkvs.impl.ConnectionManagerAwareDbKvs; import com.palantir.atlasdb.keyvalue.dbkvs.impl.postgres.DbKvsPostgresGetCandidateCellsForSweepingTest; import com.palantir.conjure.java.api.config.service.HumanReadableDuration; @@ -37,6 +26,15 @@ import com.palantir.nexus.db.pool.config.ConnectionConfig; import com.palantir.nexus.db.pool.config.ImmutableMaskedValue; import com.palantir.nexus.db.pool.config.ImmutablePostgresConnectionConfig; +import java.net.InetSocketAddress; +import java.util.concurrent.Callable; +import org.awaitility.Awaitility; +import org.awaitility.Duration; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) @SuiteClasses({ diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDbTimestampBoundStoreTest.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDbTimestampBoundStoreTest.java index 733e443f4e2..42976aa7ae7 100644 --- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDbTimestampBoundStoreTest.java +++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDbTimestampBoundStoreTest.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs; -import org.junit.After; - import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.dbkvs.impl.ConnectionManagerAwareDbKvs; import com.palantir.atlasdb.keyvalue.dbkvs.timestamp.InDbTimestampBoundStore; import com.palantir.atlasdb.timestamp.AbstractDbTimestampBoundStoreTest; import com.palantir.timestamp.TimestampBoundStore; +import org.junit.After; public class PostgresDbTimestampBoundStoreTest extends AbstractDbTimestampBoundStoreTest { private ConnectionManagerAwareDbKvs kvs; diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/DbKvsPostgresGetCandidateCellsForSweepingTest.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/DbKvsPostgresGetCandidateCellsForSweepingTest.java index 8e6c55e44b8..bb262f92081 100644 --- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/DbKvsPostgresGetCandidateCellsForSweepingTest.java +++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/DbKvsPostgresGetCandidateCellsForSweepingTest.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.postgres; -import org.junit.ClassRule; - import com.palantir.atlasdb.keyvalue.dbkvs.DbkvsPostgresTestSuite; import com.palantir.atlasdb.keyvalue.impl.AbstractGetCandidateCellsForSweepingTest; import com.palantir.atlasdb.keyvalue.impl.TestResourceManager; +import org.junit.ClassRule; public class DbKvsPostgresGetCandidateCellsForSweepingTest extends AbstractGetCandidateCellsForSweepingTest { @ClassRule diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/nexus/db/pool/HikariCpConnectionManagerTest.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/nexus/db/pool/HikariCpConnectionManagerTest.java index c719db45375..cfca357c3c7 100644 --- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/nexus/db/pool/HikariCpConnectionManagerTest.java +++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/nexus/db/pool/HikariCpConnectionManagerTest.java @@ -16,13 +16,20 @@ package com.palantir.nexus.db.pool; +import com.palantir.docker.compose.DockerComposeRule; +import com.palantir.docker.compose.configuration.ShutdownStrategy; +import com.palantir.docker.compose.connection.Container; +import com.palantir.docker.compose.connection.DockerPort; +import com.palantir.docker.compose.logging.LogDirectory; +import com.palantir.nexus.db.pool.config.ConnectionConfig; +import com.palantir.nexus.db.pool.config.ImmutableMaskedValue; +import com.palantir.nexus.db.pool.config.ImmutablePostgresConnectionConfig; import java.net.InetSocketAddress; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.SQLTransientConnectionException; import java.sql.Statement; - import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -31,15 +38,6 @@ import org.junit.Test; import org.junit.rules.ExpectedException; -import com.palantir.docker.compose.DockerComposeRule; -import com.palantir.docker.compose.configuration.ShutdownStrategy; -import com.palantir.docker.compose.connection.Container; -import com.palantir.docker.compose.connection.DockerPort; -import com.palantir.docker.compose.logging.LogDirectory; -import com.palantir.nexus.db.pool.config.ConnectionConfig; -import com.palantir.nexus.db.pool.config.ImmutableMaskedValue; -import com.palantir.nexus.db.pool.config.ImmutablePostgresConnectionConfig; - public class HikariCpConnectionManagerTest { private static final int POSTGRES_PORT_NUMBER = 5432; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbAtlasDbFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbAtlasDbFactory.java index ea2bdfb40a6..67de47b46ae 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbAtlasDbFactory.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbAtlasDbFactory.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs; -import java.util.Optional; -import java.util.function.LongSupplier; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.auto.service.AutoService; import com.google.common.base.Preconditions; import com.palantir.atlasdb.AtlasDbConstants; @@ -36,6 +29,11 @@ import com.palantir.atlasdb.util.MetricsManager; import com.palantir.timestamp.ManagedTimestampService; import com.palantir.timestamp.PersistentTimestampServiceImpl; +import java.util.Optional; +import java.util.function.LongSupplier; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @AutoService(AtlasDbFactory.class) public class DbAtlasDbFactory implements AtlasDbFactory { diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKeyValueServiceConfig.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKeyValueServiceConfig.java index 21d20023959..c24928653e8 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKeyValueServiceConfig.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKeyValueServiceConfig.java @@ -15,10 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs; -import java.util.Optional; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -27,6 +23,8 @@ import com.google.common.base.Preconditions; import com.palantir.atlasdb.spi.KeyValueServiceConfig; import com.palantir.nexus.db.pool.config.ConnectionConfig; +import java.util.Optional; +import org.immutables.value.Value; @AutoService(KeyValueServiceConfig.class) @JsonDeserialize(as = ImmutableDbKeyValueServiceConfig.class) diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DdlConfig.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DdlConfig.java index b9c19826f8a..5956de5671c 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DdlConfig.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DdlConfig.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs; -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.logsafe.Preconditions; +import org.immutables.value.Value; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = false) @JsonSubTypes({ diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/H2DdlConfig.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/H2DdlConfig.java index 986d6e23e9f..98b38cd73a2 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/H2DdlConfig.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/H2DdlConfig.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs; -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.immutables.value.Value; @JsonDeserialize(as = ImmutableH2DdlConfig.class) @JsonSerialize(as = ImmutableH2DdlConfig.class) diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleDdlConfig.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleDdlConfig.java index 21850ab9497..ab2c36c05d1 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleDdlConfig.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleDdlConfig.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs; -import java.time.Duration; -import java.util.Optional; -import java.util.function.Supplier; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -30,6 +24,10 @@ import com.palantir.atlasdb.keyvalue.dbkvs.impl.OverflowMigrationState; import com.palantir.db.oracle.JdbcHandler; import com.palantir.logsafe.Preconditions; +import java.time.Duration; +import java.util.Optional; +import java.util.function.Supplier; +import org.immutables.value.Value; @JsonDeserialize(as = ImmutableOracleDdlConfig.class) @JsonSerialize(as = ImmutableOracleDdlConfig.class) diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameUnmapper.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameUnmapper.java index e8f263376a3..30476204f0d 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameUnmapper.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameUnmapper.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs; -import java.util.concurrent.ExecutionException; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.collect.Iterables; @@ -30,6 +25,9 @@ import com.palantir.atlasdb.keyvalue.impl.TableMappingNotFoundException; import com.palantir.nexus.db.sql.AgnosticResultSet; import com.palantir.nexus.db.sql.SqlConnection; +import java.util.concurrent.ExecutionException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class OracleTableNameUnmapper { private static final Logger log = LoggerFactory.getLogger(OracleTableNameUnmapper.class); diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDdlConfig.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDdlConfig.java index c90e30718d9..0ce4000acd1 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDdlConfig.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDdlConfig.java @@ -15,14 +15,13 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs; -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.conjure.java.api.config.service.HumanReadableDuration; +import org.immutables.value.Value; @JsonDeserialize(as = ImmutablePostgresDdlConfig.class) @JsonSerialize(as = ImmutablePostgresDdlConfig.class) diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbQueryFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbQueryFactory.java index 22cab759622..cb5e68422eb 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbQueryFactory.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbQueryFactory.java @@ -15,16 +15,15 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; +import com.google.common.base.Joiner; +import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection; +import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import com.google.common.base.Joiner; -import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection; -import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection; - public abstract class AbstractDbQueryFactory implements DbQueryFactory { @Override public FullQuery getRowsColumnRangeQuery( diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbWriteTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbWriteTable.java index 4924dbc38ae..50b626dc318 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbWriteTable.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbWriteTable.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; @@ -33,6 +28,10 @@ import com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle.PrimaryKeyConstraintNames; import com.palantir.exception.PalantirSqlException; import com.palantir.nexus.db.sql.ExceptionCheck; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; public abstract class AbstractDbWriteTable implements DbWriteTable { protected final DdlConfig config; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionManagerAwareDbKvs.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionManagerAwareDbKvs.java index ba9904574ce..e5e8c3d3965 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionManagerAwareDbKvs.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionManagerAwareDbKvs.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; -import java.sql.Connection; -import java.util.function.Supplier; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.dbkvs.DbKeyValueServiceConfig; @@ -31,6 +28,8 @@ import com.palantir.nexus.db.sql.SQL; import com.palantir.nexus.db.sql.SqlConnection; import com.palantir.nexus.db.sql.SqlConnectionHelper; +import java.sql.Connection; +import java.util.function.Supplier; // This class should be removed and replaced by DbKvs when InDbTimestampStore depends directly on DbKvs public final class ConnectionManagerAwareDbKvs extends ForwardingKeyValueService { diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionSupplier.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionSupplier.java index 6c5005b82fe..2bd778a43f6 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionSupplier.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionSupplier.java @@ -15,14 +15,12 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; +import com.palantir.nexus.db.sql.SqlConnection; import java.sql.SQLException; import java.util.function.Supplier; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.palantir.nexus.db.sql.SqlConnection; - public class ConnectionSupplier implements SqlConnectionSupplier { private static final Logger log = LoggerFactory.getLogger(ConnectionSupplier.class); private volatile SqlConnection sharedConnection; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvs.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvs.java index 8c0225684a1..e9d0e86ceb8 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvs.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvs.java @@ -15,41 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.Map.Entry; -import java.util.NavigableMap; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.SortedMap; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Supplier; -import java.util.stream.Collectors; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.base.Stopwatch; @@ -132,6 +97,38 @@ import com.palantir.util.paging.AbstractPagingIterable; import com.palantir.util.paging.SimpleTokenBackedResultsPage; import com.palantir.util.paging.TokenBackedBasicResultsPage; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.Map.Entry; +import java.util.NavigableMap; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.SortedMap; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class DbKvs extends AbstractKeyValueService { private static final Logger log = LoggerFactory.getLogger(DbKvs.class); diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbQueryFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbQueryFactory.java index f22fd06d895..356c4372e0b 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbQueryFactory.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbQueryFactory.java @@ -15,14 +15,13 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; -import java.util.Collection; -import java.util.Map; - import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection; import com.palantir.atlasdb.keyvalue.api.ColumnSelection; import com.palantir.atlasdb.keyvalue.api.RangeRequest; +import java.util.Collection; +import java.util.Map; public interface DbQueryFactory { FullQuery getLatestRowQuery(byte[] row, long ts, ColumnSelection columns, boolean includeValue); diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbReadTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbReadTable.java index 9e0dc6961ac..8b3930c9943 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbReadTable.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbReadTable.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; - import com.google.common.collect.Iterables; import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection; import com.palantir.atlasdb.keyvalue.api.Cell; @@ -33,6 +25,13 @@ import com.palantir.common.base.ClosableIterators; import com.palantir.nexus.db.sql.AgnosticLightResultRow; import com.palantir.nexus.db.sql.AgnosticLightResultSet; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; public class DbReadTable { private static final int MAX_ROW_COLUMN_RANGES_FETCH_SIZE = 1000; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbTableFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbTableFactory.java index 2ac990d0967..e57b8b3ca67 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbTableFactory.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbTableFactory.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; -import java.io.Closeable; - import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.nexus.db.DBType; +import java.io.Closeable; public interface DbTableFactory extends Closeable { DbMetadataTable createMetadata(TableReference tableRef, ConnectionSupplier conns); diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbWriteTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbWriteTable.java index 5ef44ee5ab3..9452f2ee094 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbWriteTable.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbWriteTable.java @@ -15,15 +15,14 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.RangeRequest; import com.palantir.atlasdb.keyvalue.api.TimestampRangeDelete; import com.palantir.atlasdb.keyvalue.api.Value; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; public interface DbWriteTable { void put(Collection> data, long ts); diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/FullQuery.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/FullQuery.java index c645f4eb633..dfc0fbfd7d2 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/FullQuery.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/FullQuery.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; -import java.util.ArrayList; -import java.util.List; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; +import java.util.ArrayList; +import java.util.List; public class FullQuery { private final String query; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OracleDbTableFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OracleDbTableFactory.java index 9033c0db41c..3b8a13ffcbd 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OracleDbTableFactory.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OracleDbTableFactory.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; -import java.util.concurrent.ExecutorService; - import com.google.common.base.Throwables; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.dbkvs.OracleDdlConfig; @@ -28,6 +26,7 @@ import com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle.OracleWriteTable; import com.palantir.atlasdb.keyvalue.impl.TableMappingNotFoundException; import com.palantir.nexus.db.DBType; +import java.util.concurrent.ExecutorService; public class OracleDbTableFactory implements DbTableFactory { private final OracleDdlConfig config; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowValueLoader.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowValueLoader.java index c80900691df..5a76a44a5c5 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowValueLoader.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowValueLoader.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; +import com.palantir.atlasdb.keyvalue.api.TableReference; import java.util.Collection; import java.util.Map; -import com.palantir.atlasdb.keyvalue.api.TableReference; - public interface OverflowValueLoader { Map loadOverflowValues(ConnectionSupplier conns, TableReference tableRef, diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequest.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequest.java index 0c01d7ed33f..b7c646b8fa7 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequest.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequest.java @@ -15,18 +15,15 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; +import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection; +import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection; +import com.palantir.logsafe.Preconditions; import java.util.List; import java.util.Map; import java.util.Optional; - import javax.annotation.Nullable; - import org.immutables.value.Value; -import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection; -import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection; -import com.palantir.logsafe.Preconditions; - /** * Represents a batch to load in {@link com.palantir.atlasdb.keyvalue.api.KeyValueService#getRowsColumnRange( * com.palantir.atlasdb.keyvalue.api.TableReference, Iterable, ColumnRangeSelection, int, long)}. The overall iteration diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequests.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequests.java index 8f137b84f1a..78d28caa1e7 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequests.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequests.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; -import java.util.ArrayList; -import java.util.List; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; +import java.util.ArrayList; +import java.util.List; public final class RowsColumnRangeBatchRequests { private RowsColumnRangeBatchRequests() { diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SqlConnectionSupplier.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SqlConnectionSupplier.java index f31f9b4fbd6..d35bc82a23b 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SqlConnectionSupplier.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SqlConnectionSupplier.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; -import java.io.Closeable; -import java.util.function.Supplier; - import com.palantir.exception.PalantirSqlException; import com.palantir.nexus.db.sql.SqlConnection; +import java.io.Closeable; +import java.util.function.Supplier; public interface SqlConnectionSupplier extends Supplier, Closeable { @Override diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableMetadataCache.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableMetadataCache.java index 914fd258d00..a9bdefd11bb 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableMetadataCache.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableMetadataCache.java @@ -15,14 +15,12 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; -import java.util.concurrent.TimeUnit; - -import javax.annotation.Nullable; - import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.table.description.TableMetadata; +import java.util.concurrent.TimeUnit; +import javax.annotation.Nullable; public class TableMetadataCache { private static final TableMetadata EMPTY = TableMetadata.allDefault(); diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableValueStyleCache.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableValueStyleCache.java index 0237efeb533..7bba6df7d12 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableValueStyleCache.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableValueStyleCache.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; -import java.util.concurrent.ExecutionException; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.cache.Cache; @@ -28,6 +23,9 @@ import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.nexus.db.sql.AgnosticResultSet; import com.palantir.nexus.db.sql.SqlConnection; +import java.util.concurrent.ExecutionException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class TableValueStyleCache { private static final Logger log = LoggerFactory.getLogger(TableValueStyleCache.class); diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TimestampsByCellResultWithToken.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TimestampsByCellResultWithToken.java index 1f665efcce3..8bbecafc64b 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TimestampsByCellResultWithToken.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TimestampsByCellResultWithToken.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; -import java.util.Arrays; - import com.google.common.collect.HashMultimap; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; @@ -26,6 +24,7 @@ import com.palantir.atlasdb.keyvalue.api.RangeRequests; import com.palantir.common.base.ClosableIterator; import com.palantir.nexus.db.sql.AgnosticLightResultRow; +import java.util.Arrays; final class TimestampsByCellResultWithToken { private byte[] currentRow = null; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/Token.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/Token.java index 23d5a45d492..58f6a461cc0 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/Token.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/Token.java @@ -16,7 +16,6 @@ package com.palantir.atlasdb.keyvalue.dbkvs.impl; import javax.annotation.Nullable; - import org.immutables.value.Value; @Value.Immutable diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/UpdateExecutor.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/UpdateExecutor.java index a74a2bde2f0..27300700722 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/UpdateExecutor.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/UpdateExecutor.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; -import java.util.Arrays; -import java.util.List; - import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.palantir.atlasdb.keyvalue.api.Cell; @@ -25,6 +22,8 @@ import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.nexus.db.sql.AgnosticLightResultSet; import com.palantir.nexus.db.sql.PalantirSqlConnection; +import java.util.Arrays; +import java.util.List; public class UpdateExecutor { private final ConnectionSupplier conns; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/WhereClauses.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/WhereClauses.java index 31a4ce01afb..fe969a42048 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/WhereClauses.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/WhereClauses.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; -import java.util.Collection; -import java.util.List; - import com.google.common.collect.Lists; import com.palantir.atlasdb.keyvalue.api.RangeRequest; import com.palantir.nexus.db.sql.BasicSQLUtils; +import java.util.Collection; +import java.util.List; public final class WhereClauses { private final List clauses; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/AccumulatorStrategies.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/AccumulatorStrategies.java index b8dad35e55b..09305ea3806 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/AccumulatorStrategies.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/AccumulatorStrategies.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.batch; -import java.util.HashMap; -import java.util.Map; - import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; +import java.util.HashMap; +import java.util.Map; public final class AccumulatorStrategies { diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/BatchingStrategies.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/BatchingStrategies.java index df45172ddf9..e87a5bdc5e5 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/BatchingStrategies.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/BatchingStrategies.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.batch; -import java.util.List; -import java.util.Map; - import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.palantir.common.collect.Maps2; +import java.util.List; +import java.util.Map; public final class BatchingStrategies { diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/ParallelTaskRunner.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/ParallelTaskRunner.java index 033eef576c0..ffadbbd5166 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/ParallelTaskRunner.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/ParallelTaskRunner.java @@ -15,6 +15,7 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.batch; +import com.google.common.base.Throwables; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutionException; @@ -22,8 +23,6 @@ import java.util.concurrent.Future; import java.util.function.Function; -import com.google.common.base.Throwables; - public class ParallelTaskRunner implements BatchingTaskRunner { private final ExecutorService executor; private final int batchSize; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleCellTsPageLoader.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleCellTsPageLoader.java index e6166f9e077..433f72922a6 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleCellTsPageLoader.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleCellTsPageLoader.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - import com.google.common.collect.Iterables; import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweepingRequest; import com.palantir.atlasdb.keyvalue.api.RangeRequests; @@ -42,6 +37,10 @@ import com.palantir.nexus.db.sql.AgnosticLightResultRow; import com.palantir.nexus.db.sql.AgnosticLightResultSet; import com.palantir.nexus.db.sql.SqlConnection; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; // Unlike Postgres, Oracle doesn't properly support the "row value" syntax. If we want to start // our scan from a given (row_name, col_name, ts) tuple, we can't say diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleDdlTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleDdlTable.java index 9fa759835d4..8e2c8efd6d3 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleDdlTable.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleDdlTable.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle; -import java.sql.SQLException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.TimeUnit; - -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Stopwatch; import com.google.common.primitives.Ints; import com.palantir.atlasdb.AtlasDbConstants; @@ -46,6 +38,12 @@ import com.palantir.nexus.db.sql.AgnosticResultSet; import com.palantir.nexus.db.sql.SqlConnection; import com.palantir.util.VersionStrings; +import java.sql.SQLException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.TimeUnit; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class OracleDdlTable implements DbDdlTable { private static final Logger log = LoggerFactory.getLogger(OracleDdlTable.class); @@ -130,7 +128,7 @@ private boolean overflowColumnExists(String shortTableName) { private void throwForMissingOverflowTable() { throw new SafeIllegalArgumentException( - "Unsupported table change from raw to overflow for table {}, likely due to a schema change. " + "Unsupported table change from raw to overflow, likely due to a schema change. " + "Changing the table type requires manual intervention. Please roll back the change or " + "contact support for help with the change.", LoggingArgs.tableRef(tableRef)); diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleGetRange.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleGetRange.java index 1221fcec879..07456816971 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleGetRange.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleGetRange.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; - import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.collect.AbstractIterator; @@ -53,6 +44,14 @@ import com.palantir.nexus.db.DBType; import com.palantir.nexus.db.sql.AgnosticLightResultRow; import com.palantir.nexus.db.sql.AgnosticLightResultSet; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; /* * 1) When in comes to implementing paging, Oracle is the exact opposite of Postgres: diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowValueLoader.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowValueLoader.java index e30475bc1f9..5f69d166089 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowValueLoader.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowValueLoader.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; - import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -37,6 +32,10 @@ import com.palantir.db.oracle.JdbcHandler.ArrayHandler; import com.palantir.nexus.db.sql.AgnosticLightResultRow; import com.palantir.nexus.db.sql.AgnosticLightResultSet; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; public class OracleOverflowValueLoader implements OverflowValueLoader { diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowWriteTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowWriteTable.java index d47a8fc5a10..d889292a798 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowWriteTable.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowWriteTable.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle; -import java.sql.SQLException; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Joiner; import com.google.common.base.Throwables; import com.google.common.collect.Lists; @@ -47,6 +38,13 @@ import com.palantir.exception.PalantirSqlException; import com.palantir.nexus.db.sql.ExceptionCheck; import com.palantir.nexus.db.sql.SqlConnection; +import java.sql.SQLException; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class OracleOverflowWriteTable implements DbWriteTable { private static final Logger log = LoggerFactory.getLogger(OracleOverflowWriteTable.class); diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryFactory.java index 2575df1783f..122e95fff7a 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryFactory.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryFactory.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - import com.google.common.base.Joiner; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -32,6 +27,10 @@ import com.palantir.atlasdb.keyvalue.dbkvs.impl.AbstractDbQueryFactory; import com.palantir.atlasdb.keyvalue.dbkvs.impl.FullQuery; import com.palantir.db.oracle.JdbcHandler.ArrayHandler; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; public class OracleQueryFactory extends AbstractDbQueryFactory { private final OracleDdlConfig config; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryHelpers.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryHelpers.java index ba9f1dfaab6..fcf6c6ff6c9 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryHelpers.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryHelpers.java @@ -15,9 +15,8 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle; -import java.util.List; - import com.google.common.collect.ImmutableList; +import java.util.List; public final class OracleQueryHelpers { diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleTableInitializer.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleTableInitializer.java index 6a1375eac1f..d205ea8dd7c 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleTableInitializer.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleTableInitializer.java @@ -15,15 +15,14 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.dbkvs.OracleDdlConfig; import com.palantir.atlasdb.keyvalue.dbkvs.OracleErrorConstants; import com.palantir.atlasdb.keyvalue.dbkvs.impl.ConnectionSupplier; import com.palantir.atlasdb.keyvalue.dbkvs.impl.DbTableInitializer; import com.palantir.exception.PalantirSqlException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class OracleTableInitializer implements DbTableInitializer { private static final Logger log = LoggerFactory.getLogger(OracleTableInitializer.class); diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OverflowSequenceSupplier.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OverflowSequenceSupplier.java index c0ebbf9c314..5d450b37f34 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OverflowSequenceSupplier.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OverflowSequenceSupplier.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle; -import java.util.function.Supplier; - import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.dbkvs.impl.ConnectionSupplier; +import java.util.function.Supplier; public final class OverflowSequenceSupplier implements Supplier { static final int OVERFLOW_ID_CACHE_SIZE = 1000; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresCellTsPageLoader.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresCellTsPageLoader.java index b58972d79d0..5a26afa91f7 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresCellTsPageLoader.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresCellTsPageLoader.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.postgres; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - import com.google.common.collect.Iterables; import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweepingRequest; import com.palantir.atlasdb.keyvalue.api.TableReference; @@ -36,6 +31,10 @@ import com.palantir.nexus.db.DBType; import com.palantir.nexus.db.sql.AgnosticLightResultRow; import com.palantir.nexus.db.sql.AgnosticLightResultSet; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; public class PostgresCellTsPageLoader implements CellTsPairLoader { diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTable.java index 3818c180d87..94f0e302a87 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTable.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTable.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.postgres; -import java.util.concurrent.Semaphore; -import java.util.function.Predicate; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.helpers.MessageFormatter; - import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Iterables; import com.palantir.atlasdb.AtlasDbConstants; @@ -36,6 +29,11 @@ import com.palantir.nexus.db.sql.AgnosticResultRow; import com.palantir.nexus.db.sql.AgnosticResultSet; import com.palantir.nexus.db.sql.ExceptionCheck; +import java.util.concurrent.Semaphore; +import java.util.function.Predicate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.helpers.MessageFormatter; public class PostgresDdlTable implements DbDdlTable { private static final Logger log = LoggerFactory.getLogger(PostgresDdlTable.class); diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresGetRange.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresGetRange.java index 160044f7437..6203ebcaabc 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresGetRange.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresGetRange.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.postgres; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Optional; -import java.util.Set; - import com.google.common.collect.AbstractIterator; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Iterators; @@ -48,6 +41,12 @@ import com.palantir.nexus.db.DBType; import com.palantir.nexus.db.sql.AgnosticLightResultRow; import com.palantir.nexus.db.sql.AgnosticLightResultSet; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Optional; +import java.util.Set; /* 1) On Postgres, there seems to be no efficient way to page at atlas row boundaries. * The approach with 'DENSE_RANK() <= x' that works exceptionally well on Oracle, diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresQueryFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresQueryFactory.java index 08726f0760f..cb703d01a10 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresQueryFactory.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresQueryFactory.java @@ -15,10 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.postgres; -import java.util.Collection; -import java.util.List; -import java.util.Map.Entry; - import com.google.common.base.Joiner; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -30,6 +26,9 @@ import com.palantir.atlasdb.keyvalue.dbkvs.PostgresDdlConfig; import com.palantir.atlasdb.keyvalue.dbkvs.impl.AbstractDbQueryFactory; import com.palantir.atlasdb.keyvalue.dbkvs.impl.FullQuery; +import java.util.Collection; +import java.util.List; +import java.util.Map.Entry; public class PostgresQueryFactory extends AbstractDbQueryFactory { private final String tableName; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresTableInitializer.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresTableInitializer.java index 38c37d16e69..355fa9f9bb8 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresTableInitializer.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresTableInitializer.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.postgres; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.palantir.atlasdb.keyvalue.dbkvs.impl.ConnectionSupplier; import com.palantir.atlasdb.keyvalue.dbkvs.impl.DbTableInitializer; import com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle.PrimaryKeyConstraintNames; import com.palantir.exception.PalantirSqlException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class PostgresTableInitializer implements DbTableInitializer { private static final Logger log = LoggerFactory.getLogger(PostgresTableInitializer.class); diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresVersionCheck.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresVersionCheck.java index e9fee6e4dbd..6f0d85f67db 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresVersionCheck.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresVersionCheck.java @@ -15,9 +15,8 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.postgres; -import org.slf4j.Logger; - import com.palantir.util.VersionStrings; +import org.slf4j.Logger; public final class PostgresVersionCheck { private static final String MIN_POSTGRES_VERSION = "9.2"; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRange.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRange.java index 93bf09359c1..a3aee988014 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRange.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRange.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.ranges; -import java.util.Iterator; - import com.palantir.atlasdb.keyvalue.api.RangeRequest; import com.palantir.atlasdb.keyvalue.api.RowResult; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.api.Value; +import java.util.Iterator; public interface DbKvsGetRange { Iterator> getRange(TableReference tableRef, diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRanges.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRanges.java index 8ff780b5860..6aba5314f5f 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRanges.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRanges.java @@ -15,17 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.ranges; -import java.sql.Connection; -import java.util.List; -import java.util.Map; -import java.util.NavigableMap; -import java.util.SortedMap; -import java.util.SortedSet; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Joiner; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; @@ -61,6 +50,15 @@ import com.palantir.util.paging.SimpleTokenBackedResultsPage; import com.palantir.util.paging.TokenBackedBasicResultsPage; import com.palantir.util.timer.LoggingOperationTimer; +import java.sql.Connection; +import java.util.List; +import java.util.Map; +import java.util.NavigableMap; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class DbKvsGetRanges { private static final Logger log = LoggerFactory.getLogger(DbKvsGetRanges.class); diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/RangePredicateHelper.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/RangePredicateHelper.java index 20113e249f6..66186bb30c1 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/RangePredicateHelper.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/RangePredicateHelper.java @@ -15,14 +15,12 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.ranges; -import java.util.Collection; - -import javax.annotation.Nullable; - import com.google.common.base.Joiner; import com.google.common.collect.Iterables; import com.palantir.atlasdb.keyvalue.dbkvs.impl.FullQuery; import com.palantir.nexus.db.DBType; +import java.util.Collection; +import javax.annotation.Nullable; public final class RangePredicateHelper { private final boolean reverse; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CandidateGroupingIterator.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CandidateGroupingIterator.java index e0e69bf4dba..d1a0aec6530 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CandidateGroupingIterator.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CandidateGroupingIterator.java @@ -15,22 +15,20 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.sweep; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Optional; - import com.google.common.collect.Lists; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.ImmutableCandidateCellForSweeping; import com.palantir.logsafe.Preconditions; - import gnu.trove.list.TLongList; import gnu.trove.list.array.TLongArrayList; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Optional; public final class CandidateGroupingIterator implements Iterator> { private final Iterator> cellTsIterator; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CellTsPairLoader.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CellTsPairLoader.java index 4dff62639c8..13fabdf9e84 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CellTsPairLoader.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CellTsPairLoader.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.sweep; -import java.util.Iterator; -import java.util.List; - import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweepingRequest; import com.palantir.atlasdb.keyvalue.api.TableReference; +import java.util.Iterator; +import java.util.List; public interface CellTsPairLoader { diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CellTsPairToken.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CellTsPairToken.java index 41af63c35be..1c3bfc92187 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CellTsPairToken.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CellTsPairToken.java @@ -15,12 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.sweep; -import javax.annotation.Nullable; - -import org.immutables.value.Value; - import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.logsafe.Preconditions; +import javax.annotation.Nullable; +import org.immutables.value.Value; @Value.Immutable public abstract class CellTsPairToken { diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/DbKvsGetCandidateCellsForSweeping.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/DbKvsGetCandidateCellsForSweeping.java index c503fe15f1e..de9b6e2d0ba 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/DbKvsGetCandidateCellsForSweeping.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/DbKvsGetCandidateCellsForSweeping.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.sweep; -import java.util.Iterator; -import java.util.List; - import com.google.common.collect.Iterators; import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping; import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweepingRequest; import com.palantir.atlasdb.keyvalue.api.TableReference; +import java.util.Iterator; +import java.util.List; public class DbKvsGetCandidateCellsForSweeping { diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/ConnectionDbTypes.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/ConnectionDbTypes.java index bf7a21e0652..765bff1157f 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/ConnectionDbTypes.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/ConnectionDbTypes.java @@ -15,15 +15,13 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.timestamp; +import com.palantir.nexus.db.DBType; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.SQLException; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.palantir.nexus.db.DBType; - public final class ConnectionDbTypes { private static final Logger log = LoggerFactory.getLogger(ConnectionDbTypes.class); diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/InDbTimestampBoundStore.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/InDbTimestampBoundStore.java index b7bb03a8892..b1e3a5364e6 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/InDbTimestampBoundStore.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/InDbTimestampBoundStore.java @@ -15,18 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.timestamp; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import javax.annotation.Nullable; -import javax.annotation.concurrent.GuardedBy; - -import org.apache.commons.dbutils.QueryRunner; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.dbkvs.OracleErrorConstants; import com.palantir.common.base.Throwables; @@ -40,6 +28,15 @@ import com.palantir.nexus.db.pool.RetriableWriteTransaction; import com.palantir.timestamp.MultipleRunningTimestampServiceError; import com.palantir.timestamp.TimestampBoundStore; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; +import javax.annotation.Nullable; +import javax.annotation.concurrent.GuardedBy; +import org.apache.commons.dbutils.QueryRunner; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; // TODO(hsaraogi): switch to using ptdatabase sql running, which more gracefully supports multiple db types. public class InDbTimestampBoundStore implements TimestampBoundStore { diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameMapperTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameMapperTest.java index 0af6970a50b..6a5293871fe 100644 --- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameMapperTest.java +++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameMapperTest.java @@ -23,11 +23,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.keyvalue.api.TableReference; @@ -36,6 +31,10 @@ import com.palantir.nexus.db.sql.AgnosticResultRow; import com.palantir.nexus.db.sql.AgnosticResultSet; import com.palantir.nexus.db.sql.SqlConnection; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; public class OracleTableNameMapperTest { private static final String TEST_PREFIX = "a_"; diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameUnmapperTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameUnmapperTest.java index 2c49b18a6d0..f6bc9464b19 100644 --- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameUnmapperTest.java +++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameUnmapperTest.java @@ -26,13 +26,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.sql.Connection; - -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.keyvalue.api.TableReference; @@ -41,6 +34,11 @@ import com.palantir.nexus.db.sql.AgnosticResultRow; import com.palantir.nexus.db.sql.AgnosticResultSet; import com.palantir.nexus.db.sql.SqlConnection; +import java.sql.Connection; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; public class OracleTableNameUnmapperTest { diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvsPartitionersTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvsPartitionersTest.java index 91d3eaeb736..2f0c329b143 100644 --- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvsPartitionersTest.java +++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvsPartitionersTest.java @@ -15,6 +15,10 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; +import com.palantir.atlasdb.keyvalue.dbkvs.util.DbKvsPartitioners; import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; @@ -22,15 +26,9 @@ import java.util.Map; import java.util.Objects; import java.util.Random; - import org.junit.Assert; import org.junit.Test; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; -import com.palantir.atlasdb.keyvalue.dbkvs.util.DbKvsPartitioners; - public class DbKvsPartitionersTest { @Test public void testBasic() { diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowSequenceSupplierTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowSequenceSupplierTest.java index 91b18d2b91b..e360e1b99bb 100644 --- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowSequenceSupplierTest.java +++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowSequenceSupplierTest.java @@ -23,10 +23,9 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle.OverflowSequenceSupplier; import com.palantir.nexus.db.sql.SqlConnection; +import org.junit.Test; public class OverflowSequenceSupplierTest { diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/PostgresConfigLoadingTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/PostgresConfigLoadingTest.java index 89529a2ce17..8f48995f724 100644 --- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/PostgresConfigLoadingTest.java +++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/PostgresConfigLoadingTest.java @@ -21,17 +21,15 @@ import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertThat; -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; - -import org.junit.Test; - import com.palantir.atlasdb.config.AtlasDbConfig; import com.palantir.atlasdb.config.AtlasDbConfigs; import com.palantir.atlasdb.keyvalue.dbkvs.DbKeyValueServiceConfig; import com.palantir.atlasdb.spi.KeyValueServiceConfig; import com.palantir.nexus.db.pool.config.ConnectionConfig; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; +import org.junit.Test; public class PostgresConfigLoadingTest { @Test diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequestsTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequestsTest.java index c4555311d9b..e76d34c4154 100644 --- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequestsTest.java +++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequestsTest.java @@ -15,21 +15,19 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; +import com.google.common.primitives.Ints; +import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection; +import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection; import java.util.List; import java.util.stream.Collectors; - import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Maps; -import com.google.common.primitives.Ints; -import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection; -import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection; - @RunWith(Parameterized.class) public class RowsColumnRangeBatchRequestsTest { private final boolean hasPartialFirstRow; diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableValueStyleCacheTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableValueStyleCacheTest.java index e2067b89790..2c2bc3bbb5b 100644 --- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableValueStyleCacheTest.java +++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableValueStyleCacheTest.java @@ -26,18 +26,16 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.sql.Connection; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.nexus.db.sql.AgnosticResultRow; import com.palantir.nexus.db.sql.AgnosticResultSet; import com.palantir.nexus.db.sql.SqlConnection; +import java.sql.Connection; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; public class TableValueStyleCacheTest { private static final TableReference TEST_TABLE = TableReference.createFromFullyQualifiedName("ns.test_table"); diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/WhereClausesTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/WhereClausesTest.java index 00f546809e4..54ef51cd4f2 100644 --- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/WhereClausesTest.java +++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/WhereClausesTest.java @@ -18,14 +18,12 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import java.util.List; - -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.ColumnSelection; import com.palantir.atlasdb.keyvalue.api.RangeRequest; +import java.util.List; +import org.junit.Test; public class WhereClausesTest { private static final byte[] COL1 = PtBytes.toBytes("col1"); diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTableTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTableTest.java index 1de445aca47..f70ae99daa1 100644 --- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTableTest.java +++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTableTest.java @@ -26,14 +26,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mockito; - import com.google.common.collect.ImmutableMap; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.dbkvs.ImmutablePostgresDdlConfig; @@ -43,6 +35,12 @@ import com.palantir.nexus.db.DBType; import com.palantir.nexus.db.sql.AgnosticResultSetImpl; import com.palantir.nexus.db.sql.SqlConnection; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mockito; public class PostgresDdlTableTest { private PostgresDdlTable postgresDdlTable; diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/RangePredicateHelperTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/RangePredicateHelperTest.java index 873d1555a51..6eb5f97abe6 100644 --- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/RangePredicateHelperTest.java +++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/RangePredicateHelperTest.java @@ -21,12 +21,11 @@ import static org.hamcrest.Matchers.isEmptyString; import static org.junit.Assert.assertThat; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.dbkvs.impl.FullQuery; import com.palantir.nexus.db.DBType; +import org.junit.Test; public class RangePredicateHelperTest { private static final byte[] ROW_NAME = {1, 2, 3 }; diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CandidateGroupingIteratorTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CandidateGroupingIteratorTest.java index 05705b74754..c4799ae50f2 100644 --- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CandidateGroupingIteratorTest.java +++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CandidateGroupingIteratorTest.java @@ -19,19 +19,17 @@ import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; +import com.google.common.collect.ImmutableList; +import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping; +import com.palantir.atlasdb.keyvalue.api.Cell; +import com.palantir.atlasdb.keyvalue.api.ImmutableCandidateCellForSweeping; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import com.google.common.collect.ImmutableList; -import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping; -import com.palantir.atlasdb.keyvalue.api.Cell; -import com.palantir.atlasdb.keyvalue.api.ImmutableCandidateCellForSweeping; - public class CandidateGroupingIteratorTest { @Rule diff --git a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/ete/Gradle.java b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/ete/Gradle.java index d39220df357..24474db136e 100644 --- a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/ete/Gradle.java +++ b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/ete/Gradle.java @@ -23,7 +23,6 @@ import java.io.InputStream; import java.nio.file.Path; import java.nio.file.Paths; - import org.apache.commons.io.IOUtils; import org.junit.rules.ExternalResource; diff --git a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/TodoSchema.java b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/TodoSchema.java index 2b98847a621..a035f0360ff 100644 --- a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/TodoSchema.java +++ b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/TodoSchema.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.todo; -import java.io.File; - import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.Namespace; @@ -28,6 +26,7 @@ import com.palantir.atlasdb.table.description.Schema; import com.palantir.atlasdb.table.description.TableDefinition; import com.palantir.atlasdb.table.description.ValueType; +import java.io.File; public class TodoSchema implements AtlasSchema { private static final Schema INDEX_TEST_SCHEMA = generateSchema(); diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteConfiguration.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteConfiguration.java index 627632254bf..19b283c74e8 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteConfiguration.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteConfiguration.java @@ -15,13 +15,11 @@ */ package com.palantir.atlasdb; -import java.util.Optional; - import com.fasterxml.jackson.annotation.JsonProperty; import com.palantir.atlasdb.config.AtlasDbConfig; import com.palantir.atlasdb.config.AtlasDbRuntimeConfig; - import io.dropwizard.Configuration; +import java.util.Optional; public class AtlasDbEteConfiguration extends Configuration { private final AtlasDbConfig atlasdb; diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteServer.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteServer.java index 4899943351e..1f5bf3866ae 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteServer.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteServer.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb; -import java.util.Optional; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.function.LongSupplier; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.SharedMetricRegistries; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; @@ -63,12 +54,18 @@ import com.palantir.logsafe.exceptions.SafeIllegalStateException; import com.palantir.tritium.metrics.registry.SharedTaggedMetricRegistries; import com.palantir.tritium.metrics.registry.TaggedMetricRegistry; - import io.dropwizard.Application; import io.dropwizard.configuration.EnvironmentVariableSubstitutor; import io.dropwizard.configuration.SubstitutingSourceProvider; import io.dropwizard.setup.Bootstrap; import io.dropwizard.setup.Environment; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.function.LongSupplier; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class AtlasDbEteServer extends Application { private static final Logger log = LoggerFactory.getLogger(AtlasDbEteServer.class); diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/BlobSchema.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/BlobSchema.java index 31cea825f8c..67d4da19d49 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/BlobSchema.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/BlobSchema.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.blob; -import java.io.File; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.atlasdb.schema.AtlasSchema; @@ -28,6 +23,9 @@ import com.palantir.atlasdb.table.description.TableDefinition; import com.palantir.atlasdb.table.description.ValueType; import com.palantir.logsafe.UnsafeArg; +import java.io.File; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class BlobSchema implements AtlasSchema { private static final Logger log = LoggerFactory.getLogger(BlobSchema.class); diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/coordination/CoordinationResource.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/coordination/CoordinationResource.java index 272babf43e9..3e66f4d8c7c 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/coordination/CoordinationResource.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/coordination/CoordinationResource.java @@ -16,15 +16,14 @@ package com.palantir.atlasdb.coordination; +import com.palantir.atlasdb.internalschema.InternalSchemaMetadata; +import com.palantir.processors.AutoDelegate; import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import com.palantir.atlasdb.internalschema.InternalSchemaMetadata; -import com.palantir.processors.AutoDelegate; - @AutoDelegate @Path("/coordination") public interface CoordinationResource { diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/lock/SimpleLockResource.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/lock/SimpleLockResource.java index 13b19feb6ab..64c1550013f 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/lock/SimpleLockResource.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/lock/SimpleLockResource.java @@ -16,14 +16,6 @@ package com.palantir.atlasdb.lock; -import java.security.SecureRandom; -import java.util.Comparator; -import java.util.Set; -import java.util.SortedMap; -import java.util.stream.Collectors; -import java.util.stream.IntStream; -import java.util.stream.Stream; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; import com.palantir.atlasdb.transaction.api.TransactionManager; @@ -33,6 +25,13 @@ import com.palantir.lock.LockRefreshToken; import com.palantir.lock.v2.LockRequest; import com.palantir.lock.v2.LockResponse; +import java.security.SecureRandom; +import java.util.Comparator; +import java.util.Set; +import java.util.SortedMap; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import java.util.stream.Stream; public class SimpleLockResource implements LockResource { private static final SecureRandom GENERATOR = new SecureRandom(); diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/timestamp/EteTimestampResource.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/timestamp/EteTimestampResource.java index 6a6766bf2b1..9e7de3d00da 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/timestamp/EteTimestampResource.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/timestamp/EteTimestampResource.java @@ -15,14 +15,13 @@ */ package com.palantir.atlasdb.timestamp; +import com.palantir.logsafe.Safe; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; -import com.palantir.logsafe.Safe; - /** * ETE wrapper around a Timestamp service and a TimestampManagement service. */ diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/SimpleTodoResource.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/SimpleTodoResource.java index 9cfe92c2f62..c8c2ae1d2a3 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/SimpleTodoResource.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/SimpleTodoResource.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.todo; -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.util.List; - import com.palantir.atlasdb.keyvalue.api.SweepResults; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.logsafe.Preconditions; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.List; public class SimpleTodoResource implements TodoResource { private TodoClient atlas; @@ -107,4 +106,3 @@ public boolean namespacedTodoDoesNotExistBeforeTimestamp(long id, long timestamp return atlas.namespacedTodoDoesNotExistBeforeTimestamp(id, timestamp, namespace); } } - diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/Todo.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/Todo.java index 55ba5687834..cf9c59f2d9c 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/Todo.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/Todo.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.todo; -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.immutables.value.Value; @Value.Immutable @JsonSerialize(as = ImmutableTodo.class) diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoClient.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoClient.java index a8c0ea28b37..356acd642e7 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoClient.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoClient.java @@ -15,19 +15,6 @@ */ package com.palantir.atlasdb.todo; -import java.io.InputStream; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Random; -import java.util.Set; -import java.util.function.Supplier; -import java.util.stream.Collectors; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -62,6 +49,17 @@ import com.palantir.common.base.ClosableIterator; import com.palantir.util.Pair; import com.palantir.util.crypto.Sha256Hash; +import java.io.InputStream; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Random; +import java.util.Set; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TodoClient { private static final Logger log = LoggerFactory.getLogger(TodoClient.class); diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoResource.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoResource.java index a8a105eaeae..64d64799877 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoResource.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoResource.java @@ -15,8 +15,9 @@ */ package com.palantir.atlasdb.todo; +import com.palantir.atlasdb.keyvalue.api.SweepResults; +import com.palantir.atlasdb.keyvalue.api.TableReference; import java.util.List; - import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.POST; @@ -25,9 +26,6 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; -import com.palantir.atlasdb.keyvalue.api.SweepResults; -import com.palantir.atlasdb.keyvalue.api.TableReference; - @Path("/todos") public interface TodoResource { @POST diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraMultinodeTestSuite.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraMultinodeTestSuite.java index 0b015285330..e999435ec5e 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraMultinodeTestSuite.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraMultinodeTestSuite.java @@ -15,18 +15,16 @@ */ package com.palantir.atlasdb.ete; +import com.google.common.collect.ImmutableList; +import com.palantir.atlasdb.containers.CassandraEnvironment; +import com.palantir.atlasdb.ete.coordination.CoordinationEteTest; +import com.palantir.atlasdb.ete.coordination.MultipleSchemaVersionsCoordinationEteTest; import java.util.List; - import org.junit.ClassRule; import org.junit.rules.RuleChain; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import com.google.common.collect.ImmutableList; -import com.palantir.atlasdb.containers.CassandraEnvironment; -import com.palantir.atlasdb.ete.coordination.CoordinationEteTest; -import com.palantir.atlasdb.ete.coordination.MultipleSchemaVersionsCoordinationEteTest; - @RunWith(Suite.class) @Suite.SuiteClasses({ TodoEteTest.class, diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraNoLeaderTestSuite.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraNoLeaderTestSuite.java index 29f81888518..735e6477e10 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraNoLeaderTestSuite.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraNoLeaderTestSuite.java @@ -15,18 +15,16 @@ */ package com.palantir.atlasdb.ete; +import com.google.common.collect.ImmutableList; +import com.palantir.atlasdb.containers.CassandraEnvironment; +import com.palantir.atlasdb.ete.coordination.CoordinationEteTest; +import com.palantir.atlasdb.ete.coordination.MultipleSchemaVersionsCoordinationEteTest; import java.util.List; - import org.junit.ClassRule; import org.junit.rules.RuleChain; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import com.google.common.collect.ImmutableList; -import com.palantir.atlasdb.containers.CassandraEnvironment; -import com.palantir.atlasdb.ete.coordination.CoordinationEteTest; -import com.palantir.atlasdb.ete.coordination.MultipleSchemaVersionsCoordinationEteTest; - @RunWith(Suite.class) @Suite.SuiteClasses({ TodoEteTest.class, diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraTimeLockTestSuite.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraTimeLockTestSuite.java index dbd7476b0ef..ef8d2801df3 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraTimeLockTestSuite.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraTimeLockTestSuite.java @@ -15,18 +15,16 @@ */ package com.palantir.atlasdb.ete; +import com.google.common.collect.ImmutableList; +import com.palantir.atlasdb.containers.CassandraEnvironment; +import com.palantir.atlasdb.ete.coordination.CoordinationEteTest; +import com.palantir.atlasdb.ete.coordination.MultipleSchemaVersionsCoordinationEteTest; import java.util.List; - import org.junit.ClassRule; import org.junit.rules.RuleChain; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import com.google.common.collect.ImmutableList; -import com.palantir.atlasdb.containers.CassandraEnvironment; -import com.palantir.atlasdb.ete.coordination.CoordinationEteTest; -import com.palantir.atlasdb.ete.coordination.MultipleSchemaVersionsCoordinationEteTest; - @RunWith(Suite.class) @Suite.SuiteClasses({ TodoEteTest.class, diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraTimestampsEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraTimestampsEteTest.java index b5501d3b548..a31759dd49b 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraTimestampsEteTest.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraTimestampsEteTest.java @@ -17,26 +17,24 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.google.common.collect.Iterables; +import com.palantir.atlasdb.ete.cassandra.util.CassandraCommands; +import com.palantir.atlasdb.table.description.ValueType; +import com.palantir.atlasdb.todo.ImmutableTodo; +import com.palantir.atlasdb.todo.Todo; +import com.palantir.atlasdb.todo.TodoResource; +import com.palantir.atlasdb.todo.TodoSchema; import java.io.IOException; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.function.BooleanSupplier; import java.util.regex.Matcher; import java.util.regex.Pattern; - import org.awaitility.Awaitility; import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.google.common.collect.Iterables; -import com.palantir.atlasdb.ete.cassandra.util.CassandraCommands; -import com.palantir.atlasdb.table.description.ValueType; -import com.palantir.atlasdb.todo.ImmutableTodo; -import com.palantir.atlasdb.todo.Todo; -import com.palantir.atlasdb.todo.TodoResource; -import com.palantir.atlasdb.todo.TodoSchema; - public class CassandraTimestampsEteTest { private static final Todo TODO = ImmutableTodo.of("todo"); private static final Todo TODO_2 = ImmutableTodo.of("todo_two"); diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/DbKvsTestSuite.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/DbKvsTestSuite.java index aaaec5f4378..05b7840d899 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/DbKvsTestSuite.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/DbKvsTestSuite.java @@ -15,16 +15,14 @@ */ package com.palantir.atlasdb.ete; +import com.google.common.collect.ImmutableList; +import com.palantir.atlasdb.ete.coordination.CoordinationEteTest; import java.util.List; - import org.junit.ClassRule; import org.junit.rules.RuleChain; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import com.google.common.collect.ImmutableList; -import com.palantir.atlasdb.ete.coordination.CoordinationEteTest; - @RunWith(Suite.class) @Suite.SuiteClasses({ TodoEteTest.class, diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/DockerClientOrchestrationRule.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/DockerClientOrchestrationRule.java index ba31139997e..533f4a4c229 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/DockerClientOrchestrationRule.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/DockerClientOrchestrationRule.java @@ -15,18 +15,6 @@ */ package com.palantir.atlasdb.ete; -import java.io.File; -import java.io.IOException; -import java.util.Arrays; -import java.util.Map; - -import org.apache.commons.io.FileUtils; -import org.joda.time.Duration; -import org.junit.rules.ExternalResource; -import org.junit.rules.TemporaryFolder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; import com.palantir.atlasdb.containers.CassandraEnvironment; @@ -40,6 +28,16 @@ import com.palantir.docker.compose.execution.ImmutableDockerComposeExecArgument; import com.palantir.docker.compose.logging.LogDirectory; import com.palantir.docker.proxy.DockerProxyRule; +import java.io.File; +import java.io.IOException; +import java.util.Arrays; +import java.util.Map; +import org.apache.commons.io.FileUtils; +import org.joda.time.Duration; +import org.junit.rules.ExternalResource; +import org.junit.rules.TemporaryFolder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class DockerClientOrchestrationRule extends ExternalResource { private static final Logger log = LoggerFactory.getLogger(DockerClientOrchestrationRule.class); diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/EteSetup.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/EteSetup.java index dc3a1573f88..fbdf1be2074 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/EteSetup.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/EteSetup.java @@ -15,19 +15,6 @@ */ package com.palantir.atlasdb.ete; -import java.io.IOException; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.Callable; -import java.util.stream.Collectors; - -import org.awaitility.Awaitility; -import org.awaitility.Duration; -import org.junit.rules.ExternalResource; -import org.junit.rules.RuleChain; - import com.codahale.metrics.MetricRegistry; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -44,6 +31,17 @@ import com.palantir.docker.compose.execution.DockerComposeExecOption; import com.palantir.docker.compose.logging.LogDirectory; import com.palantir.docker.proxy.DockerProxyRule; +import java.io.IOException; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.Callable; +import java.util.stream.Collectors; +import org.awaitility.Awaitility; +import org.awaitility.Duration; +import org.junit.rules.ExternalResource; +import org.junit.rules.RuleChain; // Important: Some internal tests depend on this class. // Please recompile Oracle internal tests if any breaking changes are made to the setup. diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/LockWithTimelockEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/LockWithTimelockEteTest.java index abf1cd46c28..587bacbd626 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/LockWithTimelockEteTest.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/LockWithTimelockEteTest.java @@ -19,9 +19,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.Test; - import com.palantir.atlasdb.lock.LockResource; +import org.junit.Test; public class LockWithTimelockEteTest { private LockResource lockResource = EteSetup.createClientToSingleNode(LockResource.class); diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/LockWithoutTimelockEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/LockWithoutTimelockEteTest.java index c0b676ad736..44356d4dbfc 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/LockWithoutTimelockEteTest.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/LockWithoutTimelockEteTest.java @@ -18,9 +18,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.palantir.atlasdb.lock.LockResource; +import org.junit.Test; public class LockWithoutTimelockEteTest { private LockResource lockResource = EteSetup.createClientToSingleNode(LockResource.class); diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraDoubleNodeDownEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraDoubleNodeDownEteTest.java index b248d97313a..3e9723c0a34 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraDoubleNodeDownEteTest.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraDoubleNodeDownEteTest.java @@ -15,18 +15,16 @@ */ package com.palantir.atlasdb.ete; +import com.google.common.collect.ImmutableList; +import com.palantir.atlasdb.todo.ImmutableTodo; +import com.palantir.atlasdb.todo.Todo; +import com.palantir.atlasdb.todo.TodoResource; import java.util.List; import java.util.UUID; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import com.google.common.collect.ImmutableList; -import com.palantir.atlasdb.todo.ImmutableTodo; -import com.palantir.atlasdb.todo.Todo; -import com.palantir.atlasdb.todo.TodoResource; - public class MultiCassandraDoubleNodeDownEteTest { private static final List CASSANDRA_NODES_TO_KILL = ImmutableList.of("cassandra1", "cassandra2"); diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraSingleNodeDownEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraSingleNodeDownEteTest.java index 1ebbaa84fd7..b01ff9335fd 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraSingleNodeDownEteTest.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraSingleNodeDownEteTest.java @@ -17,20 +17,18 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.palantir.atlasdb.todo.ImmutableTodo; +import com.palantir.atlasdb.todo.Todo; +import com.palantir.atlasdb.todo.TodoResource; +import com.palantir.flake.FlakeRetryingRule; +import com.palantir.flake.ShouldRetry; import java.util.UUID; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; -import com.palantir.atlasdb.todo.ImmutableTodo; -import com.palantir.atlasdb.todo.Todo; -import com.palantir.atlasdb.todo.TodoResource; -import com.palantir.flake.FlakeRetryingRule; -import com.palantir.flake.ShouldRetry; - @ShouldRetry // In some cases we obtain a TTransportException from Cassandra, probably because we don't wait enough? public class MultiCassandraSingleNodeDownEteTest { private static final String CASSANDRA_NODE_TO_KILL = "cassandra1"; diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraTestSuite.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraTestSuite.java index cb10f4b3651..7fed41a1e11 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraTestSuite.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraTestSuite.java @@ -15,18 +15,16 @@ */ package com.palantir.atlasdb.ete; +import com.google.common.collect.ImmutableList; +import com.palantir.atlasdb.containers.CassandraEnvironment; +import com.palantir.atlasdb.ete.coordination.CoordinationEteTest; +import com.palantir.atlasdb.ete.coordination.MultipleSchemaVersionsCoordinationEteTest; import java.util.List; - import org.junit.ClassRule; import org.junit.rules.RuleChain; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import com.google.common.collect.ImmutableList; -import com.palantir.atlasdb.containers.CassandraEnvironment; -import com.palantir.atlasdb.ete.coordination.CoordinationEteTest; -import com.palantir.atlasdb.ete.coordination.MultipleSchemaVersionsCoordinationEteTest; - @RunWith(Suite.class) @Suite.SuiteClasses({ TodoEteTest.class, diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraUtils.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraUtils.java index cd78d4b8735..3e55c5b79f7 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraUtils.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraUtils.java @@ -15,14 +15,12 @@ */ package com.palantir.atlasdb.ete; +import com.google.common.base.Throwables; +import com.palantir.docker.compose.connection.Container; import java.io.IOException; import java.util.concurrent.TimeUnit; - import org.awaitility.Awaitility; -import com.google.common.base.Throwables; -import com.palantir.docker.compose.connection.Container; - public final class MultiCassandraUtils { private static final int CASSANDRA_PORT = 9160; diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/PostgresDbPersistenceTimeLockTestSuite.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/PostgresDbPersistenceTimeLockTestSuite.java index 8f7dc3c3ee1..68543da09a6 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/PostgresDbPersistenceTimeLockTestSuite.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/PostgresDbPersistenceTimeLockTestSuite.java @@ -15,17 +15,15 @@ */ package com.palantir.atlasdb.ete; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.palantir.atlasdb.ete.coordination.CoordinationEteTest; import java.util.List; - import org.junit.ClassRule; import org.junit.rules.RuleChain; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.palantir.atlasdb.ete.coordination.CoordinationEteTest; - @RunWith(Suite.class) @Suite.SuiteClasses({ TodoEteTest.class, diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/ServiceExposureEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/ServiceExposureEteTest.java index 0f050f06cb1..1f99ccb0cc0 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/ServiceExposureEteTest.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/ServiceExposureEteTest.java @@ -21,10 +21,9 @@ import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertThat; -import org.junit.Test; - import com.palantir.timestamp.TimestampManagementService; import com.palantir.timestamp.TimestampService; +import org.junit.Test; public class ServiceExposureEteTest { @Test diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/StreamTestUtils.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/StreamTestUtils.java index cc47104aaef..f005db7cac0 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/StreamTestUtils.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/StreamTestUtils.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.ete; -import java.util.Random; - import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.todo.TodoResource; +import java.util.Random; public final class StreamTestUtils { private StreamTestUtils() { diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TargetedSweepEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TargetedSweepEteTest.java index 3908c113590..975a490114e 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TargetedSweepEteTest.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TargetedSweepEteTest.java @@ -18,19 +18,17 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.equalTo; -import java.util.concurrent.TimeUnit; - -import org.awaitility.Awaitility; -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.todo.ImmutableTodo; import com.palantir.atlasdb.todo.Todo; import com.palantir.atlasdb.todo.TodoResource; import com.palantir.atlasdb.todo.generated.TodoSchemaTableFactory; +import java.util.concurrent.TimeUnit; +import org.awaitility.Awaitility; +import org.junit.After; +import org.junit.Assert; +import org.junit.Test; public class TargetedSweepEteTest { private static final Todo TODO = ImmutableTodo.of("some stuff to do"); diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TimeLockMigrationEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TimeLockMigrationEteTest.java index 4c796b94309..f8f3df5a9eb 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TimeLockMigrationEteTest.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TimeLockMigrationEteTest.java @@ -17,10 +17,16 @@ import static org.assertj.core.api.Assertions.catchThrowable; +import com.codahale.metrics.MetricRegistry; +import com.palantir.atlasdb.http.AtlasDbHttpClients; +import com.palantir.atlasdb.http.errors.AtlasDbRemoteException; +import com.palantir.atlasdb.todo.ImmutableTodo; +import com.palantir.atlasdb.todo.Todo; +import com.palantir.atlasdb.todo.TodoResource; +import com.palantir.timestamp.TimestampService; import java.io.File; import java.util.Optional; import java.util.concurrent.Callable; - import org.assertj.core.api.JUnitSoftAssertions; import org.awaitility.Awaitility; import org.awaitility.Duration; @@ -31,14 +37,6 @@ import org.junit.rules.RuleChain; import org.junit.rules.TemporaryFolder; -import com.codahale.metrics.MetricRegistry; -import com.palantir.atlasdb.http.AtlasDbHttpClients; -import com.palantir.atlasdb.http.errors.AtlasDbRemoteException; -import com.palantir.atlasdb.todo.ImmutableTodo; -import com.palantir.atlasdb.todo.Todo; -import com.palantir.atlasdb.todo.TodoResource; -import com.palantir.timestamp.TimestampService; - // We don't use EteSetup because we need much finer-grained control of the orchestration here, compared to the other // ETE tests where the general idea is "set up all the containers, and fire". public class TimeLockMigrationEteTest { diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TimestampManagementEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TimestampManagementEteTest.java index 81a2c7c6ae8..64198e3ca79 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TimestampManagementEteTest.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TimestampManagementEteTest.java @@ -21,9 +21,8 @@ import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertThat; -import org.junit.Test; - import com.palantir.atlasdb.timestamp.EteTimestampResource; +import org.junit.Test; public class TimestampManagementEteTest { diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TodoEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TodoEteTest.java index c66315b8640..14810a619a8 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TodoEteTest.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TodoEteTest.java @@ -19,19 +19,17 @@ import static org.hamcrest.Matchers.hasItem; import static org.junit.Assert.assertThat; -import java.net.SocketTimeoutException; - -import org.junit.After; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestRule; - import com.palantir.atlasdb.keyvalue.api.SweepResults; import com.palantir.atlasdb.todo.ImmutableTodo; import com.palantir.atlasdb.todo.Todo; import com.palantir.atlasdb.todo.TodoResource; import com.palantir.flake.FlakeRetryingRule; import com.palantir.flake.ShouldRetry; +import java.net.SocketTimeoutException; +import org.junit.After; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestRule; public class TodoEteTest { private static final Todo TODO = ImmutableTodo.of("some stuff to do"); diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/cassandra/util/CassandraCommands.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/cassandra/util/CassandraCommands.java index bb463ac9e47..095c6d32a01 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/cassandra/util/CassandraCommands.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/cassandra/util/CassandraCommands.java @@ -15,15 +15,14 @@ */ package com.palantir.atlasdb.ete.cassandra.util; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - import com.google.common.io.BaseEncoding; import com.palantir.atlasdb.ete.EteSetup; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceImpl; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; public final class CassandraCommands { private CassandraCommands() { diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/coordination/CoordinationEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/coordination/CoordinationEteTest.java index 48cb507f181..5cfed8718fa 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/coordination/CoordinationEteTest.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/coordination/CoordinationEteTest.java @@ -18,11 +18,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Before; -import org.junit.Test; - import com.palantir.atlasdb.coordination.CoordinationResource; import com.palantir.atlasdb.ete.EteSetup; +import org.junit.Before; +import org.junit.Test; public class CoordinationEteTest { private static final int VERSION_ONE = 1; diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/coordination/MultipleSchemaVersionsCoordinationEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/coordination/MultipleSchemaVersionsCoordinationEteTest.java index fc2273eb4a0..e44df402cd4 100644 --- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/coordination/MultipleSchemaVersionsCoordinationEteTest.java +++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/coordination/MultipleSchemaVersionsCoordinationEteTest.java @@ -18,10 +18,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.palantir.atlasdb.coordination.CoordinationResource; import com.palantir.atlasdb.ete.EteSetup; +import org.junit.Test; public class MultipleSchemaVersionsCoordinationEteTest { private static final int VERSION_ONE = 1; diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/config/ServerListConfig.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/config/ServerListConfig.java index 3caa7090f3d..74bfba9dacc 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/config/ServerListConfig.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/config/ServerListConfig.java @@ -15,15 +15,13 @@ */ package com.palantir.atlasdb.config; -import java.util.Optional; -import java.util.Set; - -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palantir.conjure.java.api.config.service.ProxyConfiguration; import com.palantir.conjure.java.api.config.ssl.SslConfiguration; +import java.util.Optional; +import java.util.Set; +import org.immutables.value.Value; @JsonDeserialize(as = ImmutableServerListConfig.class) @JsonSerialize(as = ImmutableServerListConfig.class) diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbErrorDecoder.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbErrorDecoder.java index 78a1d9f13ce..9cd3ec57b43 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbErrorDecoder.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbErrorDecoder.java @@ -15,16 +15,14 @@ */ package com.palantir.atlasdb.http; -import java.util.Collection; -import java.util.Date; - import com.google.common.annotations.VisibleForTesting; import com.google.common.net.HttpHeaders; import com.palantir.common.remoting.HeaderAccessUtils; - import feign.Response; import feign.RetryableException; import feign.codec.ErrorDecoder; +import java.util.Collection; +import java.util.Date; public class AtlasDbErrorDecoder implements ErrorDecoder { private ErrorDecoder delegateDecoder = new SerializableErrorDecoder(); diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbFeignTargetFactory.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbFeignTargetFactory.java index 9fc30646960..4da026ab81e 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbFeignTargetFactory.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbFeignTargetFactory.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.http; -import java.net.ProxySelector; -import java.util.Collection; -import java.util.Optional; -import java.util.function.Function; -import java.util.function.Supplier; - import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.guava.GuavaModule; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; @@ -32,7 +26,6 @@ import com.palantir.conjure.java.api.config.ssl.SslConfiguration; import com.palantir.conjure.java.config.ssl.TrustContext; import com.palantir.conjure.java.ext.refresh.RefreshableProxyInvocationHandler; - import feign.Client; import feign.Contract; import feign.Feign; @@ -42,6 +35,11 @@ import feign.codec.Encoder; import feign.codec.ErrorDecoder; import feign.jaxrs.JAXRSContract; +import java.net.ProxySelector; +import java.util.Collection; +import java.util.Optional; +import java.util.function.Function; +import java.util.function.Supplier; public final class AtlasDbFeignTargetFactory implements TargetFactory { // add some padding to the feign timeout, as in many cases lock requests default to a 60 second timeout, diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolVersion.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolVersion.java index a7f3835ad13..3181fb8b2cd 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolVersion.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolVersion.java @@ -16,12 +16,11 @@ package com.palantir.atlasdb.http; +import com.palantir.common.streams.KeyedStream; import java.util.Arrays; import java.util.Map; import java.util.Optional; -import com.palantir.common.streams.KeyedStream; - public enum AtlasDbHttpProtocolVersion { LEGACY_OR_UNKNOWN("1.0"), CONJURE_JAVA_RUNTIME("2.0"); diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbInterceptors.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbInterceptors.java index 623885df345..4bfa3325838 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbInterceptors.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbInterceptors.java @@ -16,12 +16,10 @@ package com.palantir.atlasdb.http; -import java.io.IOException; - import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; - +import java.io.IOException; import okhttp3.Interceptor; import okhttp3.Request; import okhttp3.RequestBody; @@ -61,8 +59,9 @@ public Response intercept(Chain chain) throws IOException { RequestBody body = chain.request().body(); if (body != null && body.contentLength() >= MAX_PAYLOAD_SIZE) { throw new SafeIllegalArgumentException( - "Request too large. Maximum allowed payload size is {} bytes, but the request has {}.", - SafeArg.of("maximumSize", MAX_PAYLOAD_SIZE), SafeArg.of("actualSize", body.contentLength())); + "Request too large.", + SafeArg.of("maximumAllowedSizeInBytes", MAX_PAYLOAD_SIZE), + SafeArg.of("actualSizeInBytes", body.contentLength())); } return chain.proceed(chain.request()); } diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbJacksonDecoder.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbJacksonDecoder.java index 1a07317caf6..47d9863e41f 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbJacksonDecoder.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbJacksonDecoder.java @@ -23,17 +23,15 @@ */ package com.palantir.atlasdb.http; -import java.io.BufferedInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Type; - import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.RuntimeJsonMappingException; - import feign.Response; import feign.Util; import feign.codec.Decoder; +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Type; class AtlasDbJacksonDecoder implements Decoder { private final ObjectMapper mapper; diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbJacksonEncoder.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbJacksonEncoder.java index 1896d28c39f..5cfe94c9f9e 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbJacksonEncoder.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbJacksonEncoder.java @@ -22,16 +22,14 @@ */ package com.palantir.atlasdb.http; -import java.lang.reflect.Type; -import java.nio.charset.StandardCharsets; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; - import feign.RequestTemplate; import feign.codec.EncodeException; import feign.codec.Encoder; +import java.lang.reflect.Type; +import java.nio.charset.StandardCharsets; class AtlasDbJacksonEncoder implements Encoder { private final ObjectMapper mapper; diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/CounterBackedRefreshingClient.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/CounterBackedRefreshingClient.java index 050061954de..c97f47da149 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/CounterBackedRefreshingClient.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/CounterBackedRefreshingClient.java @@ -15,19 +15,16 @@ */ package com.palantir.atlasdb.http; -import java.io.IOException; -import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.palantir.logsafe.SafeArg; - import feign.Client; import feign.Request; import feign.Response; +import java.io.IOException; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class CounterBackedRefreshingClient implements Client { private static final Logger log = LoggerFactory.getLogger(CounterBackedRefreshingClient.class); diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/ExceptionCountingRefreshingClient.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/ExceptionCountingRefreshingClient.java index 2adc1e0e150..20b639a2efa 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/ExceptionCountingRefreshingClient.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/ExceptionCountingRefreshingClient.java @@ -15,19 +15,16 @@ */ package com.palantir.atlasdb.http; -import java.io.IOException; -import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.palantir.logsafe.SafeArg; - import feign.Client; import feign.Request; import feign.Response; +import java.io.IOException; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ExceptionCountingRefreshingClient implements Client { private static final Logger log = LoggerFactory.getLogger(ExceptionCountingRefreshingClient.class); diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/ExceptionRetryBehaviour.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/ExceptionRetryBehaviour.java index 956285dc23a..439f13a52b2 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/ExceptionRetryBehaviour.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/ExceptionRetryBehaviour.java @@ -17,7 +17,6 @@ import com.palantir.atlasdb.http.errors.AtlasDbRemoteException; import com.palantir.lock.remoting.BlockingTimeoutException; - import feign.RetryableException; public enum ExceptionRetryBehaviour { diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/FailoverFeignTarget.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/FailoverFeignTarget.java index 57532205cb9..115281790c9 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/FailoverFeignTarget.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/FailoverFeignTarget.java @@ -15,26 +15,12 @@ */ package com.palantir.atlasdb.http; -import java.time.Duration; -import java.util.Collection; -import java.util.Optional; -import java.util.concurrent.ThreadLocalRandom; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.AtomicReference; - -import org.immutables.value.Value; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.palantir.common.time.Clock; import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.SafeArg; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import feign.Client; import feign.Request; @@ -43,6 +29,17 @@ import feign.RetryableException; import feign.Retryer; import feign.Target; +import java.time.Duration; +import java.util.Collection; +import java.util.Optional; +import java.util.concurrent.ThreadLocalRandom; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicReference; +import org.immutables.value.Value; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class FailoverFeignTarget implements Target, Retryer { private static final Logger log = LoggerFactory.getLogger(FailoverFeignTarget.class); diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/FeignOkHttpClients.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/FeignOkHttpClients.java index b97e776e4ec..ea830562f44 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/FeignOkHttpClients.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/FeignOkHttpClients.java @@ -15,20 +15,17 @@ */ package com.palantir.atlasdb.http; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableList; +import com.palantir.conjure.java.config.ssl.TrustContext; +import feign.Client; +import feign.okhttp.OkHttpClient; import java.net.ProxySelector; import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import java.util.function.Supplier; - import javax.net.ssl.SSLSocketFactory; - -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.ImmutableList; -import com.palantir.conjure.java.config.ssl.TrustContext; - -import feign.Client; -import feign.okhttp.OkHttpClient; import okhttp3.CipherSuite; import okhttp3.ConnectionPool; import okhttp3.ConnectionSpec; diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/InterruptHonoringRetryer.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/InterruptHonoringRetryer.java index a81e507153b..3443bc12a32 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/InterruptHonoringRetryer.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/InterruptHonoringRetryer.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.http; -import java.io.InterruptedIOException; - import feign.RetryableException; import feign.Retryer; +import java.io.InterruptedIOException; /** * Simple wrapper around the default Feign retryer that propagates {@link InterruptedIOException}s diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/OptionalAwareDecoder.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/OptionalAwareDecoder.java index 106fd5dda17..244cb230d50 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/OptionalAwareDecoder.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/OptionalAwareDecoder.java @@ -15,15 +15,14 @@ */ package com.palantir.atlasdb.http; +import feign.FeignException; +import feign.Response; +import feign.codec.Decoder; import java.io.IOException; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Optional; -import feign.FeignException; -import feign.Response; -import feign.codec.Decoder; - public class OptionalAwareDecoder implements Decoder { private final Decoder delegate; diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/PollingRefreshable.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/PollingRefreshable.java index 30859d8bc34..2b7a5130a67 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/PollingRefreshable.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/PollingRefreshable.java @@ -15,20 +15,18 @@ */ package com.palantir.atlasdb.http; -import java.time.Duration; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.palantir.common.concurrent.NamedThreadFactory; import com.palantir.common.concurrent.PTExecutors; import com.palantir.conjure.java.ext.refresh.Refreshable; import com.palantir.logsafe.UnsafeArg; +import java.time.Duration; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A PollingRefreshable serves as a bridge between a {@link Supplier} and {@link Refreshable}, polling for changes @@ -64,7 +62,7 @@ private PollingRefreshable(Supplier supplier, lastSeenValue = supplier.get(); refreshable.set(lastSeenValue); } catch (Exception e) { - log.info("Exception occurred in supplier when trying to populate the initial value."); + log.info("Exception occurred in supplier when trying to populate the initial value.", e); lastSeenValue = null; } } diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/RsErrorDecoder.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/RsErrorDecoder.java index c608213e3c9..d205e62f03b 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/RsErrorDecoder.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/RsErrorDecoder.java @@ -15,10 +15,12 @@ */ package com.palantir.atlasdb.http; +import com.google.common.io.CharStreams; +import com.palantir.logsafe.exceptions.SafeRuntimeException; +import feign.codec.ErrorDecoder; import java.io.IOException; import java.util.Collection; import java.util.Map.Entry; - import javax.ws.rs.BadRequestException; import javax.ws.rs.ClientErrorException; import javax.ws.rs.ForbiddenException; @@ -34,11 +36,6 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; -import com.google.common.io.CharStreams; -import com.palantir.logsafe.exceptions.SafeRuntimeException; - -import feign.codec.ErrorDecoder; - class RsErrorDecoder implements ErrorDecoder { @Override public RuntimeException decode(String methodKey, feign.Response feignResponse) { diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/SerializableErrorDecoder.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/SerializableErrorDecoder.java index ec61813aebe..d611e95feb0 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/SerializableErrorDecoder.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/SerializableErrorDecoder.java @@ -15,20 +15,17 @@ */ package com.palantir.atlasdb.http; -import java.io.IOException; -import java.io.InputStream; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.net.HttpHeaders; import com.palantir.atlasdb.http.errors.AtlasDbRemoteException; import com.palantir.common.remoting.HeaderAccessUtils; import com.palantir.remoting2.errors.RemoteException; import com.palantir.remoting2.errors.SerializableErrorToExceptionConverter; - import feign.Response; import feign.codec.ErrorDecoder; +import java.io.IOException; +import java.io.InputStream; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class SerializableErrorDecoder implements ErrorDecoder { private static final Logger log = LoggerFactory.getLogger(SerializableErrorDecoder.class); diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/TargetFactory.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/TargetFactory.java index 758ef6dabb7..541bcee987e 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/TargetFactory.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/TargetFactory.java @@ -16,17 +16,16 @@ package com.palantir.atlasdb.http; +import com.palantir.atlasdb.config.ServerListConfig; +import com.palantir.conjure.java.api.config.service.ProxyConfiguration; +import com.palantir.conjure.java.api.config.ssl.SslConfiguration; +import com.palantir.conjure.java.config.ssl.TrustContext; import java.net.ProxySelector; import java.util.Collection; import java.util.Optional; import java.util.function.Function; import java.util.function.Supplier; -import com.palantir.atlasdb.config.ServerListConfig; -import com.palantir.conjure.java.api.config.service.ProxyConfiguration; -import com.palantir.conjure.java.api.config.ssl.SslConfiguration; -import com.palantir.conjure.java.config.ssl.TrustContext; - public interface TargetFactory { T createProxyWithoutRetrying( Optional trustContext, diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/TextDelegateDecoder.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/TextDelegateDecoder.java index b3b5fe89694..8bb5d12ce6f 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/TextDelegateDecoder.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/TextDelegateDecoder.java @@ -29,18 +29,15 @@ package com.palantir.atlasdb.http; -import java.io.IOException; -import java.lang.reflect.Type; - -import javax.ws.rs.core.MediaType; - import com.google.common.net.HttpHeaders; import com.palantir.common.remoting.HeaderAccessUtils; - import feign.FeignException; import feign.Response; import feign.codec.Decoder; import feign.codec.StringDecoder; +import java.io.IOException; +import java.lang.reflect.Type; +import javax.ws.rs.core.MediaType; /** * If the response has a Content-Type of text/plain, then this decoder uses a string decoder. diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/UserAgents.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/UserAgents.java index 974b4f84db2..48234d61475 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/UserAgents.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/UserAgents.java @@ -15,9 +15,8 @@ */ package com.palantir.atlasdb.http; -import java.util.Optional; - import com.google.common.annotations.VisibleForTesting; +import java.util.Optional; public final class UserAgents { private static final String ATLASDB_CLIENT = "atlasdb"; diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/errors/AtlasDbRemoteException.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/errors/AtlasDbRemoteException.java index caac94defd4..05a69abe47a 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/errors/AtlasDbRemoteException.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/errors/AtlasDbRemoteException.java @@ -15,14 +15,12 @@ */ package com.palantir.atlasdb.http.errors; +import com.palantir.remoting2.errors.RemoteException; +import com.palantir.remoting2.errors.SerializableStackTraceElement; import java.util.List; import java.util.stream.Collectors; - import javax.annotation.Nullable; -import com.palantir.remoting2.errors.RemoteException; -import com.palantir.remoting2.errors.SerializableStackTraceElement; - /** * An AtlasDbRemoteException is a wrapper around a http-remoting RemoteException. * @@ -51,7 +49,8 @@ public String getErrorName() { return remoteException.getRemoteException().getErrorName(); } - // Cannot be named getStackTrace() because that is a method on RuntimeException that returns a list of
 + // Cannot be named getStackTrace() because that is a method on RuntimeException that returns a list of + // (non-serializable) StackTraceElements. @Nullable // For consistency with HTTP-Remoting API public List getRemoteStackTrace() { diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/errors/AtlasDbStackTraceElement.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/errors/AtlasDbStackTraceElement.java index a461697dfe4..d8431930953 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/errors/AtlasDbStackTraceElement.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/errors/AtlasDbStackTraceElement.java @@ -15,14 +15,12 @@ */ package com.palantir.atlasdb.http.errors; -import java.util.Optional; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palantir.remoting2.errors.SerializableStackTraceElement; +import java.util.Optional; +import org.immutables.value.Value; @JsonDeserialize(as = ImmutableAtlasDbStackTraceElement.class) @JsonSerialize(as = ImmutableAtlasDbStackTraceElement.class) diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/AtlasDbErrorDecoderTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/AtlasDbErrorDecoderTest.java index a6ff117666e..7955c4cbdba 100644 --- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/AtlasDbErrorDecoderTest.java +++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/AtlasDbErrorDecoderTest.java @@ -22,20 +22,17 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.util.Collection; -import java.util.Date; -import java.util.Map; - -import org.junit.Before; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.net.HttpHeaders; - import feign.Response; import feign.RetryableException; import feign.codec.ErrorDecoder; +import java.util.Collection; +import java.util.Date; +import java.util.Map; +import org.junit.Before; +import org.junit.Test; public class AtlasDbErrorDecoderTest { private static final String EMPTY_METHOD_KEY = ""; diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/CounterBackedRefreshingClientTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/CounterBackedRefreshingClientTest.java index 91923998765..800f6345687 100644 --- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/CounterBackedRefreshingClientTest.java +++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/CounterBackedRefreshingClientTest.java @@ -21,16 +21,13 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import java.io.IOException; -import java.util.function.Supplier; - -import org.junit.Test; - import com.google.common.collect.ImmutableMap; - import feign.Client; import feign.Request; import feign.Response; +import java.io.IOException; +import java.util.function.Supplier; +import org.junit.Test; public class CounterBackedRefreshingClientTest { @SuppressWarnings("unchecked") // For testing, and we can configure the return types appropriately. diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/ExceptionCountingRefreshingClientTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/ExceptionCountingRefreshingClientTest.java index d46902ae902..ccc5d10f5fa 100644 --- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/ExceptionCountingRefreshingClientTest.java +++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/ExceptionCountingRefreshingClientTest.java @@ -21,16 +21,13 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import java.io.IOException; -import java.util.function.Supplier; - -import org.junit.Test; - import com.google.common.collect.ImmutableMap; - import feign.Client; import feign.Request; import feign.Response; +import java.io.IOException; +import java.util.function.Supplier; +import org.junit.Test; public class ExceptionCountingRefreshingClientTest { private Supplier clientSupplier = (Supplier) mock(Supplier.class); diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/ExceptionRetryBehaviourTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/ExceptionRetryBehaviourTest.java index 1951ebc0e72..64e79a92dbf 100644 --- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/ExceptionRetryBehaviourTest.java +++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/ExceptionRetryBehaviourTest.java @@ -17,18 +17,15 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.time.Instant; -import java.util.Date; - -import org.junit.Test; - import com.palantir.atlasdb.http.errors.AtlasDbRemoteException; import com.palantir.common.remoting.ServiceNotAvailableException; import com.palantir.lock.remoting.BlockingTimeoutException; import com.palantir.remoting2.errors.RemoteException; import com.palantir.remoting2.errors.SerializableError; - import feign.RetryableException; +import java.time.Instant; +import java.util.Date; +import org.junit.Test; @SuppressWarnings("ThrowableResultOfMethodCallIgnored") // We need to create exceptions for testing. public class ExceptionRetryBehaviourTest { diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/FailoverFeignTargetTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/FailoverFeignTargetTest.java index 314506e2121..576eff16dec 100644 --- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/FailoverFeignTargetTest.java +++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/FailoverFeignTargetTest.java @@ -30,25 +30,22 @@ import static org.mockito.Mockito.when; import static org.mockito.hamcrest.MockitoHamcrest.longThat; +import com.google.common.collect.ImmutableList; +import com.palantir.atlasdb.http.errors.AtlasDbRemoteException; +import com.palantir.lock.remoting.BlockingTimeoutException; +import com.palantir.remoting2.errors.RemoteException; +import com.palantir.remoting2.errors.SerializableError; +import feign.RetryableException; import java.sql.Date; import java.time.Duration; import java.time.LocalDate; import java.util.List; import java.util.concurrent.atomic.AtomicLong; - import org.apache.http.HttpStatus; import org.hamcrest.Matcher; import org.junit.Before; import org.junit.Test; -import com.google.common.collect.ImmutableList; -import com.palantir.atlasdb.http.errors.AtlasDbRemoteException; -import com.palantir.lock.remoting.BlockingTimeoutException; -import com.palantir.remoting2.errors.RemoteException; -import com.palantir.remoting2.errors.SerializableError; - -import feign.RetryableException; - public class FailoverFeignTargetTest { private static final int FAILOVERS = 1000; private static final int ITERATIONS = 100; diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/FeignOkHttpClientsTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/FeignOkHttpClientsTest.java index d47bc2f5450..8ef809f0d29 100644 --- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/FeignOkHttpClientsTest.java +++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/FeignOkHttpClientsTest.java @@ -18,10 +18,8 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Optional; - -import org.junit.Test; - import okhttp3.OkHttpClient; +import org.junit.Test; public class FeignOkHttpClientsTest { @Test diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/InterruptHonoringRetryerTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/InterruptHonoringRetryerTest.java index c4875eb9e73..c10d7c8d01c 100644 --- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/InterruptHonoringRetryerTest.java +++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/InterruptHonoringRetryerTest.java @@ -17,14 +17,12 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; +import feign.RetryableException; import java.io.InterruptedIOException; import java.sql.Date; import java.time.Instant; - import org.junit.Test; -import feign.RetryableException; - public class InterruptHonoringRetryerTest { private final InterruptHonoringRetryer retryer = new InterruptHonoringRetryer(); diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/PollingRefreshableTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/PollingRefreshableTest.java index b9145a846c5..0c391a76784 100644 --- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/PollingRefreshableTest.java +++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/PollingRefreshableTest.java @@ -20,18 +20,16 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import com.palantir.conjure.java.ext.refresh.Refreshable; import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Supplier; - import org.jmock.lib.concurrent.DeterministicScheduler; import org.junit.Test; -import com.palantir.conjure.java.ext.refresh.Refreshable; - public class PollingRefreshableTest { private static final long FORTY_TWO = 42L; private static final Duration REFRESH_INTERVAL = Duration.of(5, ChronoUnit.HALF_DAYS); diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/SerializableErrorDecoderTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/SerializableErrorDecoderTest.java index 92b5efb99de..aa1daa19966 100644 --- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/SerializableErrorDecoderTest.java +++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/SerializableErrorDecoderTest.java @@ -17,16 +17,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; - -import javax.ws.rs.core.MediaType; - -import org.apache.http.HttpStatus; -import org.junit.Test; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; @@ -39,8 +29,14 @@ import com.palantir.lock.StringLockDescriptor; import com.palantir.remoting2.errors.SerializableError; import com.palantir.remoting2.ext.jackson.ObjectMappers; - import feign.Response; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import javax.ws.rs.core.MediaType; +import org.apache.http.HttpStatus; +import org.junit.Test; @SuppressWarnings("ThrowableNotThrown") public class SerializableErrorDecoderTest { diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/TextDelegateDecoderTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/TextDelegateDecoderTest.java index 51962b35370..ce7e1c6d977 100644 --- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/TextDelegateDecoderTest.java +++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/TextDelegateDecoderTest.java @@ -20,22 +20,18 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.net.HttpHeaders; +import feign.Response; +import feign.codec.Decoder; import java.io.IOException; import java.lang.reflect.Type; import java.util.Collection; import java.util.Map; - import javax.ws.rs.core.MediaType; - import org.junit.Test; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.net.HttpHeaders; - -import feign.Response; -import feign.codec.Decoder; - public class TextDelegateDecoderTest { private static final int HTTP_OK = 200; private static final String REASON = "reason"; diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/UserAgentsTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/UserAgentsTest.java index b0184904881..959c1a7f1cc 100644 --- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/UserAgentsTest.java +++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/UserAgentsTest.java @@ -20,7 +20,6 @@ import static org.mockito.Mockito.when; import java.util.concurrent.BlockingDeque; - import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/AtlasDbRemoteExceptionTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/AtlasDbRemoteExceptionTest.java index 39c1a27f703..de17370379c 100644 --- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/AtlasDbRemoteExceptionTest.java +++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/AtlasDbRemoteExceptionTest.java @@ -15,17 +15,14 @@ */ package com.palantir.atlasdb.http.errors; -import java.util.List; - -import javax.ws.rs.NotFoundException; - -import org.apache.http.HttpStatus; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.palantir.remoting2.errors.RemoteException; import com.palantir.remoting2.errors.SerializableError; import com.palantir.remoting2.errors.SerializableStackTraceElement; +import java.util.List; +import javax.ws.rs.NotFoundException; +import org.apache.http.HttpStatus; +import org.junit.Test; @SuppressWarnings("ThrowableInstanceNeverThrown") // This test validates properties of runtime exceptions. public class AtlasDbRemoteExceptionTest { diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/AtlasDbStackTraceElementTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/AtlasDbStackTraceElementTest.java index 445a11a554c..aaac6c6ccd2 100644 --- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/AtlasDbStackTraceElementTest.java +++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/AtlasDbStackTraceElementTest.java @@ -17,9 +17,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.palantir.remoting2.errors.SerializableStackTraceElement; +import org.junit.Test; /** * We only need to test that our custom toString() can cope with Optional.empty() in a reasonable way. diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/RemotingExceptionTestUtils.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/RemotingExceptionTestUtils.java index 13409a261b1..62563c73db1 100644 --- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/RemotingExceptionTestUtils.java +++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/RemotingExceptionTestUtils.java @@ -17,11 +17,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.util.List; -import java.util.stream.IntStream; - import com.palantir.remoting2.errors.RemoteException; import com.palantir.remoting2.errors.SerializableStackTraceElement; +import java.util.List; +import java.util.stream.IntStream; public final class RemotingExceptionTestUtils { private RemotingExceptionTestUtils() { diff --git a/atlasdb-hikari/src/main/java/com/palantir/atlasdb/jdbc/config/HikariDataSourceConfiguration.java b/atlasdb-hikari/src/main/java/com/palantir/atlasdb/jdbc/config/HikariDataSourceConfiguration.java index a6ba1672ea7..172c844b0d8 100644 --- a/atlasdb-hikari/src/main/java/com/palantir/atlasdb/jdbc/config/HikariDataSourceConfiguration.java +++ b/atlasdb-hikari/src/main/java/com/palantir/atlasdb/jdbc/config/HikariDataSourceConfiguration.java @@ -15,18 +15,15 @@ */ package com.palantir.atlasdb.jdbc.config; -import java.util.Properties; - -import javax.sql.DataSource; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.google.auto.service.AutoService; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; +import java.util.Properties; +import javax.sql.DataSource; +import org.immutables.value.Value; @AutoService(JdbcDataSourceConfiguration.class) @Value.Immutable diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/AsyncPuncher.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/AsyncPuncher.java index ee7c8a15799..44e07d87280 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/AsyncPuncher.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/AsyncPuncher.java @@ -15,6 +15,10 @@ */ package com.palantir.atlasdb.cleaner; +import com.google.common.util.concurrent.SimpleTimeLimiter; +import com.palantir.common.concurrent.NamedThreadFactory; +import com.palantir.common.concurrent.PTExecutors; +import com.palantir.logsafe.SafeArg; import java.time.Duration; import java.util.Optional; import java.util.concurrent.ScheduledExecutorService; @@ -23,15 +27,9 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.LongSupplier; import java.util.function.Supplier; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.util.concurrent.SimpleTimeLimiter; -import com.palantir.common.concurrent.NamedThreadFactory; -import com.palantir.common.concurrent.PTExecutors; -import com.palantir.logsafe.SafeArg; - /** * Wrap another Puncher, optimizing the #punch() operation to operate just on a local variable; the * underlying "real" punch operation is only invoked asynchronously at a fixed interval, with the diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/CleanupFollower.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/CleanupFollower.java index 0634f86b10c..c738d1b557e 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/CleanupFollower.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/CleanupFollower.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.cleaner; -import java.util.Collection; -import java.util.Set; - import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; @@ -28,6 +25,8 @@ import com.palantir.atlasdb.transaction.api.Transaction.TransactionType; import com.palantir.atlasdb.transaction.api.TransactionManager; import com.palantir.logsafe.Preconditions; +import java.util.Collection; +import java.util.Set; public final class CleanupFollower implements Follower { private final ImmutableMultimap cleanupTasksByTable; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/DefaultCleanerBuilder.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/DefaultCleanerBuilder.java index 9d5319613ab..bf8abbfc655 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/DefaultCleanerBuilder.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/DefaultCleanerBuilder.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.cleaner; -import java.util.List; -import java.util.Optional; -import java.util.function.LongSupplier; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.AtlasDbConstants; @@ -35,6 +27,12 @@ import com.palantir.lock.impl.LegacyTimelockService; import com.palantir.lock.v2.TimelockService; import com.palantir.timestamp.TimestampService; +import java.util.List; +import java.util.Optional; +import java.util.function.LongSupplier; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class DefaultCleanerBuilder { private static final Logger log = LoggerFactory.getLogger(DefaultCleanerBuilder.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Follower.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Follower.java index d3ae1c9c35b..6f751c49c2e 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Follower.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Follower.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.cleaner; -import java.util.Set; - import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.transaction.api.Transaction; import com.palantir.atlasdb.transaction.api.TransactionManager; +import java.util.Set; /** * A callback that is called as part of scrubbing and sweeping. diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/GlobalClock.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/GlobalClock.java index 445c71e6b5d..715646fd455 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/GlobalClock.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/GlobalClock.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.cleaner; -import java.util.function.Supplier; - import com.palantir.common.time.Clock; import com.palantir.lock.LockService; import com.palantir.lock.v2.TimelockService; +import java.util.function.Supplier; /** * Clock implementation that delegates to a LockService. diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ImmutableTimestampSupplier.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ImmutableTimestampSupplier.java index 7c4f2550458..05ffa7a0881 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ImmutableTimestampSupplier.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ImmutableTimestampSupplier.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.cleaner; -import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; - import com.google.common.base.Suppliers; import com.palantir.lock.v2.TimelockService; +import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; /** * This will return immutableTimestamps diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/InMemoryPuncherStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/InMemoryPuncherStore.java index 4df6346fe97..1a8633790c6 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/InMemoryPuncherStore.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/InMemoryPuncherStore.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.cleaner; +import com.google.common.collect.Maps; import java.util.Map; import java.util.NavigableMap; -import com.google.common.collect.Maps; - /** * A simple PuncherStore that does not actually persist. This is useful for unit testing, because * the implementation is so simple that it effectively serves as the spec for how a PuncherStore diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStore.java index 8bfb4d1344f..b7af9089943 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStore.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStore.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.cleaner; -import java.nio.charset.StandardCharsets; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.palantir.async.initializer.AsyncInitializer; @@ -32,6 +30,7 @@ import com.palantir.atlasdb.table.description.TableMetadata; import com.palantir.atlasdb.table.description.ValueType; import com.palantir.common.base.ClosableIterator; +import java.nio.charset.StandardCharsets; /** * A PuncherStore implemented as a table in the KeyValueService. diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStore.java index 7292e37e286..072bb9e2963 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStore.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStore.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.cleaner; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.SortedMap; - import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; @@ -44,6 +37,12 @@ import com.palantir.common.base.BatchingVisitable; import com.palantir.common.base.BatchingVisitableFromIterable; import com.palantir.common.base.ClosableIterator; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.SortedMap; /** * diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Scrubber.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Scrubber.java index 4c1cfbaf269..b52f0b0b15f 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Scrubber.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Scrubber.java @@ -15,27 +15,6 @@ */ package com.palantir.atlasdb.cleaner; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.SortedMap; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Supplier; - -import javax.annotation.concurrent.GuardedBy; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.HashMultimap; @@ -73,6 +52,24 @@ import com.palantir.common.concurrent.NamedThreadFactory; import com.palantir.common.concurrent.PTExecutors; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.SortedMap; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Supplier; +import javax.annotation.concurrent.GuardedBy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Scrubs individuals cells on-demand. diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ScrubberStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ScrubberStore.java index da97a92d3a0..6aee629a9aa 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ScrubberStore.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ScrubberStore.java @@ -15,14 +15,13 @@ */ package com.palantir.atlasdb.cleaner; -import java.util.Map; -import java.util.SortedMap; - import com.google.common.collect.Multimap; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.common.base.BatchingVisitable; import com.palantir.processors.AutoDelegate; +import java.util.Map; +import java.util.SortedMap; /** * This is the underlying store used by the scrubber for keeping track in a persistent way of the diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimpleCleaner.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimpleCleaner.java index 4ad7545df6a..85cb2d05a97 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimpleCleaner.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimpleCleaner.java @@ -15,17 +15,15 @@ */ package com.palantir.atlasdb.cleaner; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.Multimap; import com.palantir.atlasdb.cleaner.api.Cleaner; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.transaction.api.TransactionManager; import com.palantir.logsafe.exceptions.SafeRuntimeException; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The SimpleCleaner simply delegates to the various specialized objects that do the real work. diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimplePuncher.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimplePuncher.java index 782b6dcd133..21133a4a1d7 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimplePuncher.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimplePuncher.java @@ -15,9 +15,8 @@ */ package com.palantir.atlasdb.cleaner; -import java.util.function.Supplier; - import com.palantir.common.time.Clock; +import java.util.function.Supplier; /** * Puncher implementation that calls the underlying PuncherStore directly, and blockingly, on every diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/BackgroundCompactor.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/BackgroundCompactor.java index 36532b9bc29..a1f11353ca6 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/BackgroundCompactor.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/BackgroundCompactor.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.compact; -import java.util.Optional; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.TableReference; @@ -36,6 +28,12 @@ import com.palantir.lock.SingleLockService; import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.SafeArg; +import java.util.Optional; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class BackgroundCompactor implements AutoCloseable { public static final long SLEEP_TIME_WHEN_NOTHING_TO_COMPACT_MIN_MILLIS = TimeUnit.SECONDS.toMillis(5); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactPriorityCalculator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactPriorityCalculator.java index 33714687ff8..0179e36e419 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactPriorityCalculator.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactPriorityCalculator.java @@ -15,23 +15,21 @@ */ package com.palantir.atlasdb.compact; +import com.google.common.annotations.VisibleForTesting; +import com.palantir.atlasdb.logging.LoggingArgs; +import com.palantir.atlasdb.transaction.api.Transaction; +import com.palantir.atlasdb.transaction.api.TransactionManager; +import com.palantir.logsafe.Arg; +import com.palantir.logsafe.SafeArg; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.annotations.VisibleForTesting; -import com.palantir.atlasdb.logging.LoggingArgs; -import com.palantir.atlasdb.transaction.api.Transaction; -import com.palantir.atlasdb.transaction.api.TransactionManager; -import com.palantir.logsafe.Arg; -import com.palantir.logsafe.SafeArg; - class CompactPriorityCalculator { private static final Logger log = LoggerFactory.getLogger(CompactPriorityCalculator.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactionHistoryProvider.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactionHistoryProvider.java index 6918398c210..c4e63c9cb93 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactionHistoryProvider.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactionHistoryProvider.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.compact; -import java.util.HashMap; -import java.util.Map; - import com.palantir.atlasdb.schema.generated.CompactMetadataTable; import com.palantir.atlasdb.schema.generated.CompactTableFactory; import com.palantir.atlasdb.transaction.api.Transaction; +import java.util.HashMap; +import java.util.Map; class CompactionHistoryProvider { Map getHistory(Transaction tx) { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactionOutcomeMetrics.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactionOutcomeMetrics.java index 004bf0aa003..e47a3a8f345 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactionOutcomeMetrics.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactionOutcomeMetrics.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.compact; -import java.util.Arrays; -import java.util.concurrent.TimeUnit; - import com.codahale.metrics.SlidingTimeWindowReservoir; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; import com.palantir.atlasdb.util.MetricsManager; +import java.util.Arrays; +import java.util.concurrent.TimeUnit; class CompactionOutcomeMetrics { private final SlidingTimeWindowReservoir reservoir; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactorConfig.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactorConfig.java index b5df940aab2..1f59b98b2f1 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactorConfig.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactorConfig.java @@ -15,13 +15,11 @@ */ package com.palantir.atlasdb.compact; -import java.util.concurrent.TimeUnit; - -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.google.common.base.Preconditions; +import java.util.concurrent.TimeUnit; +import org.immutables.value.Value; @JsonSerialize(as = ImmutableCompactorConfig.class) @JsonDeserialize(as = ImmutableCompactorConfig.class) diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/SweepHistoryProvider.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/SweepHistoryProvider.java index 8906569f86e..3b76e95755e 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/SweepHistoryProvider.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/SweepHistoryProvider.java @@ -15,14 +15,13 @@ */ package com.palantir.atlasdb.compact; -import java.util.HashMap; -import java.util.Map; - import com.palantir.atlasdb.keyvalue.api.RangeRequest; import com.palantir.atlasdb.schema.generated.SweepPriorityTable; import com.palantir.atlasdb.schema.generated.SweepPriorityTable.SweepPriorityNamedColumn; import com.palantir.atlasdb.schema.generated.SweepTableFactory; import com.palantir.atlasdb.transaction.api.Transaction; +import java.util.HashMap; +import java.util.Map; class SweepHistoryProvider { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/InternalSchemaConfig.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/InternalSchemaConfig.java index e70aaffd18d..5f7d6e6a440 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/InternalSchemaConfig.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/InternalSchemaConfig.java @@ -16,15 +16,13 @@ package com.palantir.atlasdb.internalschema; -import java.util.Optional; - -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palantir.atlasdb.transaction.impl.TransactionConstants; import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.SafeArg; +import java.util.Optional; +import org.immutables.value.Value; /** * An {@link InternalSchemaConfig} contains information that can be used for controlling how the internal schema @@ -47,7 +45,7 @@ public abstract class InternalSchemaConfig { public void check() { targetTransactionsSchemaVersion().ifPresent(version -> Preconditions.checkState(TransactionConstants.SUPPORTED_TRANSACTIONS_SCHEMA_VERSIONS.contains(version), - "{} is not a recognised transactions schema version. Supported versions are {}", + "Unrecognised transactions schema version.", SafeArg.of("configuredVersion", version), SafeArg.of("supportedVersions", TransactionConstants.SUPPORTED_TRANSACTIONS_SCHEMA_VERSIONS))); } diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/InternalSchemaMetadata.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/InternalSchemaMetadata.java index 9819000b869..5eac968f726 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/InternalSchemaMetadata.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/InternalSchemaMetadata.java @@ -16,12 +16,11 @@ package com.palantir.atlasdb.internalschema; -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.google.common.collect.ImmutableRangeMap; import com.google.common.collect.Range; +import org.immutables.value.Value; /** * An {@link InternalSchemaMetadata} object controls how Atlas nodes carry out certain operations. diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/ReadOnlyTransactionSchemaManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/ReadOnlyTransactionSchemaManager.java index 61eeda30a13..3ce0bfa70d2 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/ReadOnlyTransactionSchemaManager.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/ReadOnlyTransactionSchemaManager.java @@ -16,16 +16,14 @@ package com.palantir.atlasdb.internalschema; -import java.util.Optional; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.coordination.CoordinationService; import com.palantir.atlasdb.coordination.ValueAndBound; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.util.Optional; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ReadOnlyTransactionSchemaManager { private static final Logger log = LoggerFactory.getLogger(TransactionSchemaManager.class); @@ -38,8 +36,8 @@ public ReadOnlyTransactionSchemaManager(CoordinationService copyInstallingNewValue( private static void validateProvidedTimestampBounds(long lowerBoundForNewValue, T newValue, RangeAndValue latestEntry) { if (lowerBoundForNewValue < latestEntry.longRange().lowerEndpoint()) { - throw new SafeIllegalArgumentException("Cannot install a new value at an earlier timestamp;" - + " attempted to install version {} at {}, but the newest interval is at {}.", + throw new SafeIllegalArgumentException("Cannot install a new value at an earlier timestamp", SafeArg.of("attemptedNewValue", newValue), SafeArg.of("attemptedLowerBound", lowerBoundForNewValue), SafeArg.of("existingInterval", latestEntry)); @@ -162,16 +159,15 @@ public void check() { private static void validateCoversPreciselyAllTimestamps(RangeMap timestampRangeMap) { if (timestampRangeMap.asMapOfRanges().isEmpty() || !timestampRangeMap.span().equals(ALL_TIMESTAMPS)) { - throw new SafeIllegalArgumentException("Attempted to initialize a timestamp partitioning map" - + " of {}; its span does not cover precisely all timestamps.", + throw new SafeIllegalArgumentException("Attempted to initialize a timestamp partitioning map;" + + " its span does not cover precisely all timestamps.", SafeArg.of("timestampToTransactionSchemaMap", timestampRangeMap)); } RangeSet rangesCovered = TreeRangeSet.create(timestampRangeMap.asMapOfRanges().keySet()); if (rangesCovered.asRanges().size() != 1) { - throw new SafeIllegalArgumentException("Attempted to initialize a timestamp partitioning map" - + " of {}. While the span covers all timestamps, some are missing. The disconnected ranges" - + " of the provided map were {}.", + throw new SafeIllegalArgumentException("Attempted to initialize a timestamp partitioning map." + + " While the span covers all timestamps, there are some disconnected ranges.", SafeArg.of("timestampToTransactionSchemaMap", timestampRangeMap), SafeArg.of("disconnectedRanges", rangesCovered)); } diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TransactionSchemaInstaller.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TransactionSchemaInstaller.java index 8517a45e254..9339a07f7c1 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TransactionSchemaInstaller.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TransactionSchemaInstaller.java @@ -16,19 +16,17 @@ package com.palantir.atlasdb.internalschema; +import com.google.common.annotations.VisibleForTesting; +import com.palantir.common.concurrent.PTExecutors; +import com.palantir.logsafe.SafeArg; import java.time.Duration; import java.util.Optional; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.annotations.VisibleForTesting; -import com.palantir.common.concurrent.PTExecutors; -import com.palantir.logsafe.SafeArg; - public final class TransactionSchemaInstaller implements AutoCloseable { private static final Logger log = LoggerFactory.getLogger(TransactionSchemaInstaller.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TransactionSchemaManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TransactionSchemaManager.java index 2aa72f0beb5..609d4993d42 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TransactionSchemaManager.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TransactionSchemaManager.java @@ -16,13 +16,6 @@ package com.palantir.atlasdb.internalschema; -import java.util.List; -import java.util.Map; -import java.util.Optional; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Iterables; import com.google.common.collect.Range; @@ -33,6 +26,11 @@ import com.palantir.common.concurrent.CoalescingSupplier; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TransactionSchemaManager { private static final Logger log = LoggerFactory.getLogger(TransactionSchemaManager.class); @@ -56,8 +54,8 @@ public TransactionSchemaManager(CoordinationService coor */ public int getTransactionsSchemaVersion(long timestamp) { if (timestamp < AtlasDbConstants.STARTING_TS) { - throw new SafeIllegalStateException("Query attempted for timestamp {} which was never given out by the" - + " timestamp service, as timestamps start at {}", + throw new SafeIllegalStateException("Query attempted at a timestamp which was never given out by the" + + " timestamp service", SafeArg.of("queriedTimestamp", timestamp), SafeArg.of("startOfTime", AtlasDbConstants.STARTING_TS)); } diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/metrics/MetadataCoordinationServiceMetrics.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/metrics/MetadataCoordinationServiceMetrics.java index e4517fd8d90..365eb07e1ee 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/metrics/MetadataCoordinationServiceMetrics.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/metrics/MetadataCoordinationServiceMetrics.java @@ -16,13 +16,6 @@ package com.palantir.atlasdb.internalschema.metrics; -import java.util.Optional; -import java.util.function.Function; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.codahale.metrics.Clock; import com.palantir.atlasdb.AtlasDbMetricNames; import com.palantir.atlasdb.coordination.CoordinationService; @@ -32,6 +25,11 @@ import com.palantir.atlasdb.monitoring.TrackerUtils; import com.palantir.atlasdb.util.MetricsManager; import com.palantir.timestamp.TimestampService; +import java.util.Optional; +import java.util.function.Function; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class MetadataCoordinationServiceMetrics { private static final Logger log = LoggerFactory.getLogger(MetadataCoordinationServiceMetrics.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/CoordinationServices.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/CoordinationServices.java index bdbaa3af0b2..d317f66f7bf 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/CoordinationServices.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/CoordinationServices.java @@ -16,8 +16,6 @@ package com.palantir.atlasdb.internalschema.persistence; -import java.util.function.LongSupplier; - import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.coordination.CoordinationService; import com.palantir.atlasdb.coordination.CoordinationServiceImpl; @@ -30,6 +28,7 @@ import com.palantir.atlasdb.util.MetricsManager; import com.palantir.conjure.java.serialization.ObjectMappers; import com.palantir.timestamp.TimestampService; +import java.util.function.LongSupplier; public final class CoordinationServices { private CoordinationServices() { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/InternalSchemaMetadataPayloadCodec.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/InternalSchemaMetadataPayloadCodec.java index 2c4be6919f0..5cb3bcf75a4 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/InternalSchemaMetadataPayloadCodec.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/InternalSchemaMetadataPayloadCodec.java @@ -16,11 +16,6 @@ package com.palantir.atlasdb.internalschema.persistence; -import java.io.IOException; -import java.util.Map; -import java.util.Optional; -import java.util.function.Function; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; @@ -28,6 +23,10 @@ import com.palantir.conjure.java.serialization.ObjectMappers; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.io.IOException; +import java.util.Map; +import java.util.Optional; +import java.util.function.Function; /** * The {@link InternalSchemaMetadataPayloadCodec} controls translation between the payload of a diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/VersionedInternalSchemaMetadata.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/VersionedInternalSchemaMetadata.java index 7a285267e21..2d5756c67be 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/VersionedInternalSchemaMetadata.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/VersionedInternalSchemaMetadata.java @@ -16,14 +16,12 @@ package com.palantir.atlasdb.internalschema.persistence; -import java.util.Optional; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palantir.atlasdb.internalschema.InternalSchemaMetadata; +import java.util.Optional; +import org.immutables.value.Value; /** * A serialized form of {@link InternalSchemaMetadata} that includes both a diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/TableMappingService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/TableMappingService.java index 361c7fc68af..07f6179b262 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/TableMappingService.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/TableMappingService.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.keyvalue; -import java.util.Map; -import java.util.Set; - import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.impl.TableMappingNotFoundException; import com.palantir.common.annotation.Idempotent; +import java.util.Map; +import java.util.Set; public interface TableMappingService { /** diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/api/WriteReferencePersister.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/api/WriteReferencePersister.java index 00fbe605515..d941c7ef47b 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/api/WriteReferencePersister.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/api/WriteReferencePersister.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.api; -import java.io.IOException; - import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.fasterxml.jackson.module.afterburner.AfterburnerModule; @@ -24,6 +22,7 @@ import com.palantir.atlasdb.ptobject.EncodingUtils; import com.palantir.atlasdb.sweep.queue.id.SweepTableIndices; import com.palantir.logsafe.exceptions.SafeRuntimeException; +import java.io.IOException; public final class WriteReferencePersister { private static final byte[] writePrefix = { 1 }; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/KvTableMappingService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/KvTableMappingService.java index 84ca0e20656..d8131dae6ff 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/KvTableMappingService.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/KvTableMappingService.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.impl; -import java.util.Collections; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.LongSupplier; - -import org.apache.commons.lang3.Validate; - import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.collect.ImmutableList; @@ -54,6 +45,13 @@ import com.palantir.atlasdb.table.description.ValueType; import com.palantir.common.base.ClosableIterator; import com.palantir.logsafe.Preconditions; +import java.util.Collections; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.LongSupplier; +import org.apache.commons.lang3.Validate; public class KvTableMappingService implements TableMappingService { public static final TableMetadata NAMESPACE_TABLE_METADATA = TableMetadata.internal() diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueService.java index 156da6bda97..a2d98d021ba 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueService.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueService.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.impl; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.stream.Collectors; - import com.google.common.collect.ForwardingObject; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; @@ -48,6 +41,12 @@ import com.palantir.atlasdb.keyvalue.api.Value; import com.palantir.common.base.ClosableIterator; import com.palantir.util.paging.TokenBackedBasicResultsPage; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.stream.Collectors; public final class TableRemappingKeyValueService extends ForwardingObject implements KeyValueService { public static TableRemappingKeyValueService create(KeyValueService delegate, diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueService.java index 44f71c4b059..097e8a4900d 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueService.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueService.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.impl; -import java.util.Collection; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Optional; -import java.util.Set; - import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -51,6 +43,13 @@ import com.palantir.common.base.ClosableIterator; import com.palantir.logsafe.Preconditions; import com.palantir.util.paging.TokenBackedBasicResultsPage; +import java.util.Collection; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; +import java.util.Set; /* * WARNING: Code assumes that this will be called above namespace mapping layer. diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfig.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfig.java index 0f8460bd49a..c49667a3ef8 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfig.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfig.java @@ -15,14 +15,12 @@ */ package com.palantir.atlasdb.memory; -import java.util.Optional; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.auto.service.AutoService; import com.palantir.atlasdb.spi.KeyValueServiceConfig; +import java.util.Optional; +import org.immutables.value.Value; @JsonTypeName(InMemoryAtlasDbConfig.TYPE) @AutoService(KeyValueServiceConfig.class) diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactory.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactory.java index ce8315e8eb8..0e73c3773cb 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactory.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactory.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.memory; -import java.util.Optional; -import java.util.Set; -import java.util.function.LongSupplier; -import java.util.function.Supplier; -import java.util.stream.Collectors; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.auto.service.AutoService; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; @@ -64,6 +55,13 @@ import com.palantir.lock.impl.LockServiceImpl; import com.palantir.timestamp.InMemoryTimestampService; import com.palantir.timestamp.ManagedTimestampService; +import java.util.Optional; +import java.util.Set; +import java.util.function.LongSupplier; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This is the easiest way to try out AtlasDB with your schema. It runs entirely in memory but has diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/monitoring/TimestampTracker.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/monitoring/TimestampTracker.java index 2731d619eb7..25725ed4d7c 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/monitoring/TimestampTracker.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/monitoring/TimestampTracker.java @@ -15,16 +15,14 @@ */ package com.palantir.atlasdb.monitoring; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.codahale.metrics.Clock; import com.google.common.annotations.VisibleForTesting; import com.palantir.atlasdb.cleaner.api.Cleaner; import com.palantir.atlasdb.util.MetricsManager; import com.palantir.lock.v2.TimelockService; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class TimestampTracker { private static final Logger log = LoggerFactory.getLogger(TimestampTracker.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/monitoring/TrackerUtils.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/monitoring/TrackerUtils.java index b6c2058b1af..979bf1942ac 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/monitoring/TrackerUtils.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/monitoring/TrackerUtils.java @@ -16,20 +16,18 @@ package com.palantir.atlasdb.monitoring; +import com.codahale.metrics.CachedGauge; +import com.codahale.metrics.Clock; +import com.codahale.metrics.Gauge; +import com.google.common.annotations.VisibleForTesting; +import com.palantir.logsafe.SafeArg; import java.time.Duration; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.function.BinaryOperator; import java.util.function.Supplier; - import org.slf4j.Logger; -import com.codahale.metrics.CachedGauge; -import com.codahale.metrics.Clock; -import com.codahale.metrics.Gauge; -import com.google.common.annotations.VisibleForTesting; -import com.palantir.logsafe.SafeArg; - public final class TrackerUtils { // We cache underlying calls, in case a hyper-aggressive metrics client repeatedly queries the values. @VisibleForTesting diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/CheckAndSetExceptionMapper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/CheckAndSetExceptionMapper.java index 8ee85ca12fc..6216a423594 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/CheckAndSetExceptionMapper.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/CheckAndSetExceptionMapper.java @@ -15,21 +15,18 @@ */ package com.palantir.atlasdb.persistentlock; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; +import com.palantir.atlasdb.keyvalue.api.CheckAndSetException; +import com.palantir.logsafe.SafeArg; import java.util.List; import java.util.UUID; - import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; -import com.palantir.atlasdb.keyvalue.api.CheckAndSetException; -import com.palantir.logsafe.SafeArg; - public class CheckAndSetExceptionMapper implements ExceptionMapper { private static final Logger log = LoggerFactory.getLogger(CheckAndSetExceptionMapper.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockService.java index 181cd6d88f6..021fa814b42 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockService.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockService.java @@ -15,14 +15,13 @@ */ package com.palantir.atlasdb.persistentlock; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.CheckAndSetException; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.conjure.java.server.jersey.WebPreconditions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class KvsBackedPersistentLockService implements PersistentLockService { private static final Logger log = LoggerFactory.getLogger(KvsBackedPersistentLockService.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/LockEntry.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/LockEntry.java index 0e754aa7185..966d8179c9e 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/LockEntry.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/LockEntry.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.persistentlock; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.SortedMap; -import java.util.UUID; - -import org.immutables.value.Value; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -30,6 +23,11 @@ import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.RowResult; import com.palantir.common.base.Throwables; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.SortedMap; +import java.util.UUID; +import org.immutables.value.Value; @JsonSerialize(as = ImmutableLockEntry.class) @JsonDeserialize(as = ImmutableLockEntry.class) diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/LockStoreImpl.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/LockStoreImpl.java index cfdea20ecbd..0c29a3659b6 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/LockStoreImpl.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/LockStoreImpl.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.persistentlock; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; @@ -38,6 +29,13 @@ import com.palantir.atlasdb.keyvalue.api.RowResult; import com.palantir.atlasdb.keyvalue.api.Value; import com.palantir.logsafe.SafeArg; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * LockStore manages {@link LockEntry} objects, specifically for the "Backup Lock" (to be taken out by backup and diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/restore/V1TransactionsTableRangeDeleter.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/restore/V1TransactionsTableRangeDeleter.java index 282a3ab66ae..700938239a6 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/restore/V1TransactionsTableRangeDeleter.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/restore/V1TransactionsTableRangeDeleter.java @@ -16,8 +16,6 @@ package com.palantir.atlasdb.restore; -import java.util.OptionalLong; - import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.palantir.atlasdb.AtlasDbConstants; @@ -30,6 +28,7 @@ import com.palantir.common.base.ClosableIterator; import com.palantir.logsafe.SafeArg; import com.palantir.timestamp.TimestampRange; +import java.util.OptionalLong; public class V1TransactionsTableRangeDeleter implements TransactionTableRangeDeleter { private final KeyValueService kvs; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigrator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigrator.java index c39eaadf1f6..5819fc6fbce 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigrator.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigrator.java @@ -16,13 +16,6 @@ package com.palantir.atlasdb.schema; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; - import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; @@ -34,6 +27,12 @@ import com.palantir.atlasdb.transaction.api.TransactionManager; import com.palantir.common.base.Throwables; import com.palantir.common.concurrent.PTExecutors; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; public class KeyValueServiceMigrator { private final TableReference checkpointTable; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigratorUtils.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigratorUtils.java index 224f42820ac..3e0c85dbe6c 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigratorUtils.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigratorUtils.java @@ -15,17 +15,16 @@ */ package com.palantir.atlasdb.schema; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.io.Writer; -import java.util.Set; - import com.google.common.collect.Sets; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.schema.KeyValueServiceMigrator.KvsMigrationMessageLevel; import com.palantir.atlasdb.schema.KeyValueServiceMigrator.KvsMigrationMessageProcessor; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.io.Writer; +import java.util.Set; public final class KeyValueServiceMigratorUtils { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidator.java index d7844a2f4f1..54bfc98c797 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidator.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidator.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.schema; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; - import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.util.concurrent.Futures; @@ -40,6 +33,12 @@ import com.palantir.common.base.BatchingVisitableView; import com.palantir.common.base.Throwables; import com.palantir.common.concurrent.PTExecutors; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; public class KeyValueServiceValidator { private final TransactionManager validationFromTransactionManager; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidators.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidators.java index 9115a5d026f..424a82159fb 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidators.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidators.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.schema; -import java.util.Set; -import java.util.stream.Collectors; - import com.google.common.annotations.VisibleForTesting; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.TableReference; +import java.util.Set; +import java.util.stream.Collectors; public final class KeyValueServiceValidators { private KeyValueServiceValidators() { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AbortingCommitTsLoader.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AbortingCommitTsLoader.java index b67c362786a..d32c7223fd9 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AbortingCommitTsLoader.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AbortingCommitTsLoader.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.sweep; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.github.benmanes.caffeine.cache.CacheLoader; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -32,6 +24,12 @@ import com.palantir.atlasdb.transaction.impl.TransactionConstants; import com.palantir.atlasdb.transaction.service.TransactionService; import com.palantir.logsafe.SafeArg; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class AbortingCommitTsLoader implements CacheLoader { private static final Logger log = LoggerFactory.getLogger(AbortingCommitTsLoader.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSource.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSource.java index 4eecb5c8879..7669012af44 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSource.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSource.java @@ -15,16 +15,14 @@ */ package com.palantir.atlasdb.sweep; +import com.palantir.atlasdb.util.MetricsManager; +import com.palantir.logsafe.SafeArg; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; - import org.apache.commons.lang3.math.NumberUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.palantir.atlasdb.util.MetricsManager; -import com.palantir.logsafe.SafeArg; - public final class AdjustableSweepBatchConfigSource { private static final Logger log = LoggerFactory.getLogger(BackgroundSweeperImpl.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweepThread.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweepThread.java index 1498a85bab1..3faedc5c8d6 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweepThread.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweepThread.java @@ -15,16 +15,6 @@ */ package com.palantir.atlasdb.sweep; -import java.time.Duration; -import java.util.Optional; -import java.util.Set; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException; @@ -41,6 +31,14 @@ import com.palantir.lock.SingleLockService; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; +import java.time.Duration; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class BackgroundSweepThread implements Runnable { private static final Logger log = LoggerFactory.getLogger(BackgroundSweepThread.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeperImpl.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeperImpl.java index ce28e7cb642..13408505be4 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeperImpl.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeperImpl.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.sweep; -import java.util.Set; -import java.util.concurrent.CountDownLatch; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.Sets; import com.palantir.atlasdb.sweep.metrics.SweepOutcome; import com.palantir.atlasdb.sweep.metrics.SweepOutcomeMetrics; @@ -31,6 +24,11 @@ import com.palantir.common.base.Throwables; import com.palantir.lock.LockService; import com.palantir.logsafe.Preconditions; +import java.util.Set; +import java.util.concurrent.CountDownLatch; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class BackgroundSweeperImpl implements BackgroundSweeper, AutoCloseable { private static final Logger log = LoggerFactory.getLogger(BackgroundSweeperImpl.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BatchOfCellsToSweep.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BatchOfCellsToSweep.java index a614eb6541d..2ef39297098 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BatchOfCellsToSweep.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BatchOfCellsToSweep.java @@ -15,12 +15,10 @@ */ package com.palantir.atlasdb.sweep; +import com.palantir.atlasdb.keyvalue.api.Cell; import java.util.List; - import org.immutables.value.Value; -import com.palantir.atlasdb.keyvalue.api.Cell; - @Value.Immutable public interface BatchOfCellsToSweep { List cells(); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellToSweep.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellToSweep.java index 103fd93bc58..120c68cfd5f 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellToSweep.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellToSweep.java @@ -15,12 +15,10 @@ */ package com.palantir.atlasdb.sweep; +import com.palantir.atlasdb.keyvalue.api.Cell; import java.util.List; - import org.immutables.value.Value; -import com.palantir.atlasdb.keyvalue.api.Cell; - @Value.Immutable public interface CellToSweep { Cell cell(); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellsSweeper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellsSweeper.java index 3da43b37e68..92568c2bfb6 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellsSweeper.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellsSweeper.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.sweep; -import java.util.Collection; -import java.util.Comparator; -import java.util.Map; -import java.util.stream.Collectors; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.Multimap; import com.palantir.atlasdb.cleaner.Follower; import com.palantir.atlasdb.keyvalue.api.Cell; @@ -34,6 +26,12 @@ import com.palantir.logsafe.Arg; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; +import java.util.Collection; +import java.util.Comparator; +import java.util.Map; +import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class CellsSweeper { private static final Logger log = LoggerFactory.getLogger(CellsSweeper.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellsToSweepPartitioningIterator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellsToSweepPartitioningIterator.java index 063046902ab..598100d0110 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellsToSweepPartitioningIterator.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellsToSweepPartitioningIterator.java @@ -15,14 +15,13 @@ */ package com.palantir.atlasdb.sweep; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - import com.google.common.collect.AbstractIterator; import com.google.common.collect.Lists; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.logsafe.Preconditions; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; // The batches can end up very small or even empty after we filter out unsweepable cells, // so we want to re-partition them before deleting. diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CommitTsCache.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CommitTsCache.java index 7ad1e033385..ef4674b16dc 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CommitTsCache.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CommitTsCache.java @@ -15,15 +15,14 @@ */ package com.palantir.atlasdb.sweep; +import com.github.benmanes.caffeine.cache.Caffeine; +import com.github.benmanes.caffeine.cache.LoadingCache; +import com.palantir.atlasdb.transaction.service.TransactionService; import java.util.Collection; import java.util.Map; import java.util.Optional; import java.util.concurrent.TimeUnit; -import com.github.benmanes.caffeine.cache.Caffeine; -import com.github.benmanes.caffeine.cache.LoadingCache; -import com.palantir.atlasdb.transaction.service.TransactionService; - public final class CommitTsCache { private static final Long ONE_MILLION = 1_000_000L; private LoadingCache cache; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/PersistentLockManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/PersistentLockManager.java index 26dfc477899..c89d07fdca6 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/PersistentLockManager.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/PersistentLockManager.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.sweep; -import java.util.List; - -import javax.annotation.concurrent.GuardedBy; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.codahale.metrics.Meter; import com.google.common.annotations.VisibleForTesting; import com.palantir.atlasdb.keyvalue.api.CheckAndSetException; @@ -32,6 +25,10 @@ import com.palantir.exception.NotInitializedException; import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.SafeArg; +import java.util.List; +import javax.annotation.concurrent.GuardedBy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; // TODO move to persistentlock package? public class PersistentLockManager implements AutoCloseable { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SpecificTableSweeper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SpecificTableSweeper.java index c596d29dcdb..d6f1b71fa23 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SpecificTableSweeper.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SpecificTableSweeper.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.sweep; -import javax.annotation.Nullable; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.KeyValueService; @@ -41,6 +36,9 @@ import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; +import javax.annotation.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class SpecificTableSweeper { private static final Logger log = LoggerFactory.getLogger(SpecificTableSweeper.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepBatchConfig.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepBatchConfig.java index da33f5a1ebf..925c3991769 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepBatchConfig.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepBatchConfig.java @@ -15,9 +15,8 @@ */ package com.palantir.atlasdb.sweep; -import org.immutables.value.Value; - import com.palantir.logsafe.Preconditions; +import org.immutables.value.Value; @Value.Immutable public interface SweepBatchConfig { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepPerformanceResults.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepPerformanceResults.java index b0767d17079..49a539226d6 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepPerformanceResults.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepPerformanceResults.java @@ -15,9 +15,8 @@ */ package com.palantir.atlasdb.sweep; -import org.immutables.value.Value; - import com.palantir.atlasdb.keyvalue.api.SweepResults; +import org.immutables.value.Value; @Value.Immutable public abstract class SweepPerformanceResults { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTableResponse.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTableResponse.java index 472f0ec810a..194222b2c50 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTableResponse.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTableResponse.java @@ -15,14 +15,12 @@ */ package com.palantir.atlasdb.sweep; -import java.util.Optional; - -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.SweepResults; +import java.util.Optional; +import org.immutables.value.Value; @Value.Immutable @JsonSerialize(as = ImmutableSweepTableResponse.class) diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTaskRunner.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTaskRunner.java index 3f0a8566d47..c46d044c501 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTaskRunner.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTaskRunner.java @@ -15,16 +15,6 @@ */ package com.palantir.atlasdb.sweep; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Optional; -import java.util.concurrent.TimeUnit; -import java.util.function.LongSupplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Stopwatch; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableList; @@ -50,6 +40,14 @@ import com.palantir.common.base.ClosableIterator; import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.UnsafeArg; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Optional; +import java.util.concurrent.TimeUnit; +import java.util.function.LongSupplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Sweeps one individual table. diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepableCellFilter.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepableCellFilter.java index a9c04ce7cb1..3c6bc52703b 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepableCellFilter.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepableCellFilter.java @@ -15,6 +15,9 @@ */ package com.palantir.atlasdb.sweep; +import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping; +import com.palantir.atlasdb.keyvalue.api.Value; +import com.palantir.atlasdb.transaction.impl.TransactionConstants; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -23,10 +26,6 @@ import java.util.Set; import java.util.stream.Collectors; -import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping; -import com.palantir.atlasdb.keyvalue.api.Value; -import com.palantir.atlasdb.transaction.impl.TransactionConstants; - public class SweepableCellFilter { private final CommitTsCache commitTsCache; private final Sweeper sweeper; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/Sweeper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/Sweeper.java index 40e93365683..07e57faee9c 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/Sweeper.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/Sweeper.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.sweep; -import java.util.Optional; -import java.util.function.Function; - import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.atlasdb.sweep.queue.ShardAndStrategy; import com.palantir.atlasdb.sweep.queue.SpecialTimestampsSupplier; +import java.util.Optional; +import java.util.function.Function; public enum Sweeper { CONSERVATIVE(provider -> Math.min(provider.getUnreadableTimestamp(), provider.getImmutableTimestamp()), diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperService.java index 190c8ae01d5..2d2137e79ac 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperService.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperService.java @@ -15,8 +15,8 @@ */ package com.palantir.atlasdb.sweep; +import com.palantir.logsafe.Safe; import java.util.Optional; - import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -24,8 +24,6 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; -import com.palantir.logsafe.Safe; - /** * Provides endpoints for sweeping a specific table. */ diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperServiceImpl.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperServiceImpl.java index fdb08e6fa21..a1e3f552b4d 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperServiceImpl.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperServiceImpl.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.sweep; -import java.util.Optional; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.SweepResults; import com.palantir.atlasdb.keyvalue.api.TableReference; @@ -27,6 +22,9 @@ import com.palantir.conjure.java.server.jersey.WebPreconditions; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; +import java.util.Optional; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class SweeperServiceImpl implements SweeperService { private static final Logger log = LoggerFactory.getLogger(SweeperServiceImpl.class); @@ -143,4 +141,3 @@ private SweepResults runOneBatchWithoutSavingResults( } } - diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/TableToSweep.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/TableToSweep.java index 44277330044..5900612ca28 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/TableToSweep.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/TableToSweep.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.sweep; -import java.util.Optional; - import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.SweepResults; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.sweep.progress.SweepProgress; import com.palantir.lock.SingleLockService; +import java.util.Optional; public final class TableToSweep { private final TableReference tableRef; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/SweepOutcomeMetrics.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/SweepOutcomeMetrics.java index 6244a951148..1fcdca32315 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/SweepOutcomeMetrics.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/SweepOutcomeMetrics.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.sweep.metrics; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; - import com.codahale.metrics.Reservoir; import com.codahale.metrics.SlidingTimeWindowArrayReservoir; import com.google.common.collect.ImmutableList; @@ -27,6 +22,10 @@ import com.palantir.atlasdb.AtlasDbMetricNames; import com.palantir.atlasdb.sweep.BackgroundSweeperImpl; import com.palantir.atlasdb.util.MetricsManager; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; public final class SweepOutcomeMetrics { public static final List LEGACY_OUTCOMES = Arrays.asList(SweepOutcome.values()); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/TargetedSweepMetrics.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/TargetedSweepMetrics.java index 13e5b68f70a..6e7d091b8b2 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/TargetedSweepMetrics.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/TargetedSweepMetrics.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.sweep.metrics; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.codahale.metrics.Gauge; import com.google.common.collect.ImmutableMap; import com.palantir.atlasdb.AtlasDbMetricNames; @@ -40,6 +32,12 @@ import com.palantir.util.AggregatingVersionedMetric; import com.palantir.util.AggregatingVersionedSupplier; import com.palantir.util.CachedComposedSupplier; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.function.Function; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("checkstyle:FinalClass") // non-final for mocking public class TargetedSweepMetrics { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/NextTableToSweepProvider.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/NextTableToSweepProvider.java index 6bf9f41708b..88020b85e82 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/NextTableToSweepProvider.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/NextTableToSweepProvider.java @@ -15,17 +15,6 @@ */ package com.palantir.atlasdb.sweep.priority; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Maps; import com.palantir.atlasdb.keyvalue.api.KeyValueService; @@ -38,6 +27,15 @@ import com.palantir.lock.SingleLockService; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class NextTableToSweepProvider { private static final Logger log = LoggerFactory.getLogger(NextTableToSweepProvider.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/StreamStoreRemappingSweepPriorityCalculator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/StreamStoreRemappingSweepPriorityCalculator.java index fdaac82167e..8fd1b9b47f5 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/StreamStoreRemappingSweepPriorityCalculator.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/StreamStoreRemappingSweepPriorityCalculator.java @@ -15,15 +15,14 @@ */ package com.palantir.atlasdb.sweep.priority; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; -import java.util.stream.Collectors; - import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.schema.stream.StreamTableType; import com.palantir.atlasdb.transaction.api.Transaction; import com.palantir.common.annotation.Output; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.function.Function; +import java.util.stream.Collectors; public class StreamStoreRemappingSweepPriorityCalculator { public static final long INDEX_TO_VALUE_TABLE_SLEEP_TIME = TimeUnit.MINUTES.toMillis(65); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriority.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriority.java index 716438eab2f..c2b73f245a3 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriority.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriority.java @@ -15,12 +15,10 @@ */ package com.palantir.atlasdb.sweep.priority; +import com.palantir.atlasdb.keyvalue.api.TableReference; import java.util.OptionalLong; - import org.immutables.value.Value; -import com.palantir.atlasdb.keyvalue.api.TableReference; - @Value.Immutable public interface SweepPriority { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityCalculator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityCalculator.java index 51afccd9dcf..aa78745bf24 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityCalculator.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityCalculator.java @@ -15,19 +15,6 @@ */ package com.palantir.atlasdb.sweep.priority; -import java.time.Duration; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; -import java.util.stream.Collectors; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -39,6 +26,17 @@ import com.palantir.atlasdb.schema.stream.StreamTableType; import com.palantir.atlasdb.transaction.api.Transaction; import com.palantir.logsafe.SafeArg; +import java.time.Duration; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.function.Function; +import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class SweepPriorityCalculator { private static final Logger log = LoggerFactory.getLogger(SweepPriorityCalculator.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityOverrideConfig.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityOverrideConfig.java index adadb0c9ee7..4e68cfdc23e 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityOverrideConfig.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityOverrideConfig.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.sweep.priority; -import java.util.List; -import java.util.Set; -import java.util.stream.Stream; - -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.google.common.base.Preconditions; @@ -28,6 +22,10 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.palantir.atlasdb.keyvalue.api.TableReference; +import java.util.List; +import java.util.Set; +import java.util.stream.Stream; +import org.immutables.value.Value; @JsonSerialize(as = ImmutableSweepPriorityOverrideConfig.class) @JsonDeserialize(as = ImmutableSweepPriorityOverrideConfig.class) diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStore.java index 1d38748d734..971a8a1e41d 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStore.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStore.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.sweep.priority; -import java.util.Collection; -import java.util.List; - import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.transaction.api.Transaction; import com.palantir.processors.AutoDelegate; +import java.util.Collection; +import java.util.List; @AutoDelegate public interface SweepPriorityStore { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStoreImpl.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStoreImpl.java index c6703a86f09..9bad6988c1c 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStoreImpl.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStoreImpl.java @@ -15,10 +15,6 @@ */ package com.palantir.atlasdb.sweep.priority; -import java.util.Collection; -import java.util.List; -import java.util.OptionalLong; - import com.google.common.collect.Collections2; import com.google.common.collect.Lists; import com.palantir.async.initializer.AsyncInitializer; @@ -35,6 +31,9 @@ import com.palantir.atlasdb.transaction.api.Transaction; import com.palantir.atlasdb.transaction.api.TransactionReadSentinelBehavior; import com.palantir.atlasdb.transaction.impl.UnmodifiableTransaction; +import java.util.Collection; +import java.util.List; +import java.util.OptionalLong; public final class SweepPriorityStoreImpl implements SweepPriorityStore { private class InitializingWrapper extends AsyncInitializer implements AutoDelegate_SweepPriorityStore { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/UpdateSweepPriority.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/UpdateSweepPriority.java index 65d0d46b7fa..a57382099ec 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/UpdateSweepPriority.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/UpdateSweepPriority.java @@ -16,7 +16,6 @@ package com.palantir.atlasdb.sweep.priority; import java.util.OptionalLong; - import org.immutables.value.Value; @Value.Immutable diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgress.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgress.java index 0fb1a3f8c15..e0e8b1da6f5 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgress.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgress.java @@ -15,15 +15,13 @@ */ package com.palantir.atlasdb.sweep.progress; -import java.util.Optional; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palantir.atlasdb.keyvalue.api.SweepResults; import com.palantir.atlasdb.keyvalue.api.TableReference; +import java.util.Optional; +import org.immutables.value.Value; @JsonSerialize(as = ImmutableSweepProgress.class) @JsonDeserialize(as = ImmutableSweepProgress.class) diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgressStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgressStore.java index 31e5fabfd97..0ad070632db 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgressStore.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgressStore.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.sweep.progress; -import java.util.Optional; - import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.processors.AutoDelegate; +import java.util.Optional; @AutoDelegate public interface SweepProgressStore { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgressStoreImpl.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgressStoreImpl.java index 968a961c82b..a76f277afab 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgressStoreImpl.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgressStoreImpl.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.sweep.progress; -import java.util.Arrays; -import java.util.Map; -import java.util.Optional; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; @@ -40,6 +33,11 @@ import com.palantir.atlasdb.logging.LoggingArgs; import com.palantir.atlasdb.table.description.TableMetadata; import com.palantir.atlasdb.table.description.ValueType; +import java.util.Arrays; +import java.util.Map; +import java.util.Optional; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class SweepProgressStoreImpl implements SweepProgressStore { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/DedicatedRows.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/DedicatedRows.java index 03c6ae41575..8312ad049a7 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/DedicatedRows.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/DedicatedRows.java @@ -16,12 +16,10 @@ package com.palantir.atlasdb.sweep.queue; +import com.palantir.atlasdb.schema.generated.SweepableCellsTable.SweepableCellsRow; import java.util.List; - import org.immutables.value.Value; -import com.palantir.atlasdb.schema.generated.SweepableCellsTable.SweepableCellsRow; - @Value.Immutable public interface DedicatedRows { @Value.Parameter diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/MultiTableSweepQueueWriter.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/MultiTableSweepQueueWriter.java index 5aa4bbdb09d..6b8d093f53f 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/MultiTableSweepQueueWriter.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/MultiTableSweepQueueWriter.java @@ -15,14 +15,13 @@ */ package com.palantir.atlasdb.sweep.queue; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - import com.palantir.async.initializer.CallbackInitializable; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.transaction.api.TransactionManager; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * Adds {@link WriteInfo}s to a global queue to be swept. diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/PartitionInfo.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/PartitionInfo.java index cea1360b478..36fb4e854cc 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/PartitionInfo.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/PartitionInfo.java @@ -15,9 +15,8 @@ */ package com.palantir.atlasdb.sweep.queue; -import org.immutables.value.Value; - import com.palantir.util.PersistableBoolean; +import org.immutables.value.Value; @Value.Immutable public interface PartitionInfo { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/ShardAndStrategy.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/ShardAndStrategy.java index 7e77d7e1397..cb5ce60f6c8 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/ShardAndStrategy.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/ShardAndStrategy.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.sweep.queue; -import org.immutables.value.Value; - import com.google.common.base.Preconditions; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.lock.LockDescriptor; import com.palantir.lock.StringLockDescriptor; +import org.immutables.value.Value; @Value.Immutable public abstract class ShardAndStrategy { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/ShardProgress.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/ShardProgress.java index cc4d06fa46d..eb23ae8c2f1 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/ShardProgress.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/ShardProgress.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.sweep.queue; -import java.util.Map; -import java.util.Optional; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.palantir.atlasdb.AtlasDbConstants; @@ -35,6 +29,10 @@ import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.SafeArg; import com.palantir.util.PersistableBoolean; +import java.util.Map; +import java.util.Optional; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ShardProgress { private static final Logger log = LoggerFactory.getLogger(ShardProgress.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SpecialTimestampsSupplier.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SpecialTimestampsSupplier.java index 1bc887232ec..e3689766164 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SpecialTimestampsSupplier.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SpecialTimestampsSupplier.java @@ -15,9 +15,8 @@ */ package com.palantir.atlasdb.sweep.queue; -import java.util.function.LongSupplier; - import com.palantir.atlasdb.transaction.api.TransactionManager; +import java.util.function.LongSupplier; public class SpecialTimestampsSupplier { private final LongSupplier unreadableTsSupplier; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatch.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatch.java index 064aadb65b8..56d6fe17663 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatch.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatch.java @@ -17,7 +17,6 @@ import java.util.Collection; import java.util.List; - import org.immutables.value.Value; /** diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatchAccumulator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatchAccumulator.java index 4314fbdabdd..6ecd99a7a95 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatchAccumulator.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatchAccumulator.java @@ -16,15 +16,14 @@ package com.palantir.atlasdb.sweep.queue; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.palantir.atlasdb.schema.generated.SweepableCellsTable; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; class SweepBatchAccumulator { private final List accumulatedWrites = Lists.newArrayList(); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatchWithPartitionInfo.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatchWithPartitionInfo.java index 9f7ea7a8450..2289bd87f7e 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatchWithPartitionInfo.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatchWithPartitionInfo.java @@ -16,12 +16,10 @@ package com.palantir.atlasdb.sweep.queue; -import java.util.Set; - -import org.immutables.value.Value; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import java.util.Set; +import org.immutables.value.Value; @Value.Immutable public interface SweepBatchWithPartitionInfo { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueue.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueue.java index 4a702a31943..32521d4c091 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueue.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueue.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.sweep.queue; -import java.util.List; -import java.util.concurrent.TimeUnit; -import java.util.function.IntSupplier; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Suppliers; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.schema.TargetedSweepSchema; @@ -36,6 +28,12 @@ import com.palantir.atlasdb.transaction.service.TransactionServices; import com.palantir.lock.v2.TimelockService; import com.palantir.logsafe.SafeArg; +import java.util.List; +import java.util.concurrent.TimeUnit; +import java.util.function.IntSupplier; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class SweepQueue implements MultiTableSweepQueueWriter { private static final Logger log = LoggerFactory.getLogger(SweepQueue.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueCleaner.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueCleaner.java index d5b45cf4f65..e0f7ce083c8 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueCleaner.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueCleaner.java @@ -15,16 +15,14 @@ */ package com.palantir.atlasdb.sweep.queue; +import com.palantir.atlasdb.logging.LoggingArgs; +import com.palantir.atlasdb.schema.generated.TargetedSweepTableFactory; +import com.palantir.logsafe.SafeArg; import java.util.Set; import java.util.stream.Collectors; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.palantir.atlasdb.logging.LoggingArgs; -import com.palantir.atlasdb.schema.generated.TargetedSweepTableFactory; -import com.palantir.logsafe.SafeArg; - public class SweepQueueCleaner { private static final Logger log = LoggerFactory.getLogger(SweepQueueCleaner.class); private SweepableCells sweepableCells; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueDeleter.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueDeleter.java index bfb6e4b842d..02ec52011ec 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueDeleter.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueDeleter.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.sweep.queue; -import java.util.Arrays; -import java.util.Collection; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.Iterables; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.Cell; @@ -32,6 +23,13 @@ import com.palantir.atlasdb.keyvalue.api.TimestampRangeDelete; import com.palantir.atlasdb.logging.LoggingArgs; import com.palantir.atlasdb.sweep.Sweeper; +import java.util.Arrays; +import java.util.Collection; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class SweepQueueDeleter { private static final Logger log = LoggerFactory.getLogger(SweepQueueDeleter.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueTable.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueTable.java index 4422e1e5d2b..5dace8ae0ad 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueTable.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueTable.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.sweep.queue; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Stream; - -import javax.annotation.Nullable; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.Streams; import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection; @@ -34,6 +25,13 @@ import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.impl.LocalRowColumnRangeIterator; import com.palantir.atlasdb.sweep.metrics.TargetedSweepMetrics; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.stream.Stream; +import javax.annotation.Nullable; public abstract class SweepQueueTable { final KeyValueService kvs; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueUtils.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueUtils.java index aaf3f26d0be..5622b82c4e5 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueUtils.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueUtils.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.sweep.queue; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; - import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection; @@ -32,6 +26,11 @@ import com.palantir.common.persist.Persistable; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; public final class SweepQueueUtils { public static final long REFRESH_TIME = TimeUnit.MINUTES.toMillis(5L); @@ -93,8 +92,8 @@ public static void validateNumberOfCellsWritten(Collection> writ writes.forEach(writesForShard -> { int cellsWritten = writesForShard.size(); if (cellsWritten > MAX_CELLS_PER_SHARD) { - throw new SafeIllegalArgumentException("Attempted to persist targeted sweep information for {} cells " - + "in the same shard. This exceeds the maximum number of cells {} per shard per transaction. " + throw new SafeIllegalArgumentException("Attempted to persist targeted sweep information for cells in " + + "the same shard. This exceeds the allowed maximum number of cells per shard per transaction. " + "The transaction will be aborted. Consider changing your workflow to break up the operation " + "into several smaller transactions.", SafeArg.of("cellsWritten", cellsWritten), diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueWriter.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueWriter.java index be6aa482eec..70cb43ad541 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueWriter.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueWriter.java @@ -15,13 +15,11 @@ */ package com.palantir.atlasdb.sweep.queue; +import com.palantir.logsafe.SafeArg; import java.util.List; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.palantir.logsafe.SafeArg; - class SweepQueueWriter implements MultiTableSweepQueueWriter { private static final Logger log = LoggerFactory.getLogger(SweepQueueWriter.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepableCells.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepableCells.java index 74a36ac4efa..aa654a79643 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepableCells.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepableCells.java @@ -17,18 +17,6 @@ import static com.google.common.base.Preconditions.checkState; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.SortedSet; -import java.util.stream.Collectors; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -60,6 +48,16 @@ import com.palantir.atlasdb.transaction.impl.TransactionConstants; import com.palantir.atlasdb.transaction.service.TransactionService; import com.palantir.logsafe.SafeArg; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.SortedSet; +import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class SweepableCells extends SweepQueueTable { private final Logger log = LoggerFactory.getLogger(SweepableCells.class); @@ -418,4 +416,3 @@ private long exactColumnOrElseBeginningOfRow(long startTsInclusive, long partiti return Math.max(startTsInclusive - SweepQueueUtils.minTsForFinePartition(partitionFine), 0); } } - diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepableTimestamps.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepableTimestamps.java index ecbdbd2de38..ccd0a136fcb 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepableTimestamps.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepableTimestamps.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.sweep.queue; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.palantir.atlasdb.keyvalue.api.Cell; @@ -31,6 +25,11 @@ import com.palantir.atlasdb.schema.generated.SweepableTimestampsTable; import com.palantir.atlasdb.schema.generated.TargetedSweepTableFactory; import com.palantir.util.PersistableBoolean; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; public class SweepableTimestamps extends SweepQueueTable { private static final byte[] DUMMY = new byte[0]; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweepFollower.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweepFollower.java index 92cc0b300b0..72291d1b7dc 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweepFollower.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweepFollower.java @@ -15,14 +15,13 @@ */ package com.palantir.atlasdb.sweep.queue; -import java.util.List; -import java.util.Set; - import com.palantir.atlasdb.cleaner.Follower; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.transaction.api.Transaction; import com.palantir.atlasdb.transaction.api.TransactionManager; +import java.util.List; +import java.util.Set; public class TargetedSweepFollower { private final List followers; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweeper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweeper.java index 02c7a93b21f..4bac0c1285c 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweeper.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweeper.java @@ -15,18 +15,6 @@ */ package com.palantir.atlasdb.sweep.queue; -import java.time.Duration; -import java.util.List; -import java.util.Optional; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Supplier; -import java.util.stream.IntStream; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Stopwatch; import com.google.common.base.Suppliers; @@ -53,6 +41,16 @@ import com.palantir.lock.v2.TimelockService; import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.SafeArg; +import java.time.Duration; +import java.util.List; +import java.util.Optional; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Supplier; +import java.util.stream.IntStream; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings({"FinalClass", "Not final for mocking in tests"}) public class TargetedSweeper implements MultiTableSweepQueueWriter, BackgroundSweeper { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperLock.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperLock.java index 586aaa5dad5..37ecb9ff32b 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperLock.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperLock.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.sweep.queue; -import java.util.Optional; - import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.lock.v2.LockRequest; import com.palantir.lock.v2.LockToken; import com.palantir.lock.v2.TimelockService; +import java.util.Optional; public final class TargetedSweeperLock { private final ShardAndStrategy shardStrategy; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TimestampsToSweep.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TimestampsToSweep.java index f8807751eb6..d2e677da365 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TimestampsToSweep.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TimestampsToSweep.java @@ -16,7 +16,6 @@ package com.palantir.atlasdb.sweep.queue; import java.util.SortedSet; - import org.immutables.value.Value; @Value.Immutable diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/WriteInfo.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/WriteInfo.java index e07c5ef860f..40e44944010 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/WriteInfo.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/WriteInfo.java @@ -15,14 +15,13 @@ */ package com.palantir.atlasdb.sweep.queue; -import org.immutables.value.Value; - import com.google.common.math.IntMath; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.api.TimestampRangeDelete; import com.palantir.atlasdb.keyvalue.api.WriteReference; import com.palantir.atlasdb.sweep.Sweeper; +import org.immutables.value.Value; /** * Contains information about a committed write, for use by the sweep queue. diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/WriteInfoPartitioner.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/WriteInfoPartitioner.java index 972a17b367e..1e113dde0a4 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/WriteInfoPartitioner.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/WriteInfoPartitioner.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.sweep.queue; -import java.util.List; -import java.util.Map; -import java.util.function.Supplier; -import java.util.stream.Collectors; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; @@ -33,6 +25,12 @@ import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.atlasdb.table.description.TableMetadata; import com.palantir.common.base.Throwables; +import java.util.List; +import java.util.Map; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class WriteInfoPartitioner { private static final Logger log = LoggerFactory.getLogger(WriteInfoPartitioner.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/ConservativeSweepWatermarkStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/ConservativeSweepWatermarkStore.java index 4384cf26b3a..99da10d3f67 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/ConservativeSweepWatermarkStore.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/ConservativeSweepWatermarkStore.java @@ -16,11 +16,10 @@ package com.palantir.atlasdb.sweep.queue.clear; +import com.palantir.atlasdb.keyvalue.api.TableReference; import java.util.Map; import java.util.Set; -import com.palantir.atlasdb.keyvalue.api.TableReference; - public interface ConservativeSweepWatermarkStore { void updateWatermarks(long newWatermark, Set conservativeTables); Map getWatermarks(Set tableReferences); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/DefaultConservativeSweepWatermarkStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/DefaultConservativeSweepWatermarkStore.java index babf14563a6..b50aef31306 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/DefaultConservativeSweepWatermarkStore.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/DefaultConservativeSweepWatermarkStore.java @@ -16,11 +16,6 @@ package com.palantir.atlasdb.sweep.queue.clear; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.palantir.atlasdb.keyvalue.api.Cell; @@ -36,6 +31,10 @@ import com.palantir.atlasdb.schema.generated.TableClearsTable.TableClearsRowResult; import com.palantir.atlasdb.schema.generated.TargetedSweepTableFactory; import com.palantir.common.streams.KeyedStream; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; public final class DefaultConservativeSweepWatermarkStore implements ConservativeSweepWatermarkStore { private static final TableReference CLEARS = TargetedSweepTableFactory.of().getTableClearsTable(null).getTableRef(); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/DefaultTableClearer.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/DefaultTableClearer.java index 39f067bbb4b..d980fd23dbc 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/DefaultTableClearer.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/DefaultTableClearer.java @@ -16,13 +16,6 @@ package com.palantir.atlasdb.sweep.queue.clear; -import java.util.Collection; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.function.Consumer; -import java.util.stream.Collectors; - import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import com.google.common.annotations.VisibleForTesting; @@ -35,6 +28,12 @@ import com.palantir.atlasdb.sweep.queue.TargetedSweepFilter; import com.palantir.atlasdb.sweep.queue.WriteInfo; import com.palantir.atlasdb.table.description.TableMetadata; +import java.util.Collection; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.function.Consumer; +import java.util.stream.Collectors; public final class DefaultTableClearer implements TableClearer, TargetedSweepFilter { private final LoadingCache sweepStrategies; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/SafeTableClearerKeyValueService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/SafeTableClearerKeyValueService.java index bc423388648..1ae4e81d748 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/SafeTableClearerKeyValueService.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/SafeTableClearerKeyValueService.java @@ -16,13 +16,12 @@ package com.palantir.atlasdb.sweep.queue.clear; -import java.util.Set; - import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.RangeRequest; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.impl.ForwardingKeyValueService; import com.palantir.atlasdb.sweep.queue.ImmutableTimestampSupplier; +import java.util.Set; public class SafeTableClearerKeyValueService extends ForwardingKeyValueService { private final KeyValueService delegate; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/TableClearer.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/TableClearer.java index 46219c82502..f25d148bca1 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/TableClearer.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/TableClearer.java @@ -16,10 +16,9 @@ package com.palantir.atlasdb.sweep.queue.clear; -import java.util.Set; - import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.keyvalue.api.TableReference; +import java.util.Set; public interface TableClearer { void deleteAllRowsInTables(Set tables); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/config/TargetedSweepInstallConfig.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/config/TargetedSweepInstallConfig.java index 17db148e139..2f9456edb39 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/config/TargetedSweepInstallConfig.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/config/TargetedSweepInstallConfig.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.sweep.queue.config; -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.google.common.base.Preconditions; import com.palantir.atlasdb.AtlasDbConstants; +import org.immutables.value.Value; @JsonDeserialize(as = ImmutableTargetedSweepInstallConfig.class) @JsonSerialize(as = ImmutableTargetedSweepInstallConfig.class) diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/config/TargetedSweepRuntimeConfig.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/config/TargetedSweepRuntimeConfig.java index beca06c77fe..e3674b9bf64 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/config/TargetedSweepRuntimeConfig.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/config/TargetedSweepRuntimeConfig.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.sweep.queue.config; -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.google.common.base.Preconditions; import com.palantir.atlasdb.AtlasDbConstants; +import org.immutables.value.Value; @JsonDeserialize(as = ImmutableTargetedSweepRuntimeConfig.class) @JsonSerialize(as = ImmutableTargetedSweepRuntimeConfig.class) diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/IdsToNames.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/IdsToNames.java index fe049516f65..a9ccef2d70b 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/IdsToNames.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/IdsToNames.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.sweep.queue.id; -import java.util.Collections; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.Optional; - import com.google.common.collect.Iterables; import com.google.common.primitives.Ints; import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection; @@ -36,6 +31,10 @@ import com.palantir.atlasdb.schema.generated.SweepIdToNameTable.SweepIdToNameRow; import com.palantir.atlasdb.schema.generated.SweepIdToNameTable.SweepIdToNameRowResult; import com.palantir.atlasdb.schema.generated.TargetedSweepTableFactory; +import java.util.Collections; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Optional; class IdsToNames { private static final TargetedSweepTableFactory tableFactory = TargetedSweepTableFactory.of(); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/NamesToIds.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/NamesToIds.java index 2ba487c08f8..e5991ea3f83 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/NamesToIds.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/NamesToIds.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.sweep.queue.id; -import java.util.Collections; -import java.util.Optional; - import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.CheckAndSetException; import com.palantir.atlasdb.keyvalue.api.CheckAndSetRequest; @@ -28,6 +25,8 @@ import com.palantir.atlasdb.schema.generated.SweepNameToIdTable.SweepNameToIdRow; import com.palantir.atlasdb.schema.generated.TargetedSweepTableFactory; import com.palantir.logsafe.Preconditions; +import java.util.Collections; +import java.util.Optional; class NamesToIds { private static final TargetedSweepTableFactory tableFactory = TargetedSweepTableFactory.of(); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIndices.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIndices.java index a4d462c0f81..840a2d563b0 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIndices.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIndices.java @@ -15,18 +15,16 @@ */ package com.palantir.atlasdb.sweep.queue.id; -import java.util.NoSuchElementException; -import java.util.Optional; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.logging.LoggingArgs; import com.palantir.logsafe.SafeArg; +import java.util.NoSuchElementException; +import java.util.Optional; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Creates a dictionary of table references to shorter (integral) identifiers. diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/MutableRange.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/MutableRange.java index e3da2248ef6..0d36290105c 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/MutableRange.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/MutableRange.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.table.common; -import java.util.Arrays; - import com.palantir.atlasdb.keyvalue.api.RangeRequest; import com.palantir.logsafe.Preconditions; +import java.util.Arrays; public class MutableRange { private byte[] startRow; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/RangeVisitor.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/RangeVisitor.java index ee7916874ea..bcbdfc84c02 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/RangeVisitor.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/RangeVisitor.java @@ -15,16 +15,6 @@ */ package com.palantir.atlasdb.table.common; -import java.math.BigInteger; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.atomic.AtomicLong; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -39,6 +29,14 @@ import com.palantir.common.base.Throwables; import com.palantir.common.concurrent.BlockingWorkerPool; import com.palantir.lock.HeldLocksToken; +import java.math.BigInteger; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.atomic.AtomicLong; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RangeVisitor { private static final Logger log = LoggerFactory.getLogger(RangeVisitor.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/TableTasks.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/TableTasks.java index 4bf692ae63c..27144d028c9 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/TableTasks.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/TableTasks.java @@ -15,17 +15,6 @@ */ package com.palantir.atlasdb.table.common; -import java.math.BigInteger; -import java.util.Collection; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.atomic.AtomicLong; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.base.Predicate; @@ -52,6 +41,15 @@ import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; +import java.math.BigInteger; +import java.util.Collection; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.atomic.AtomicLong; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class TableTasks { private static final Logger log = LoggerFactory.getLogger(TableTasks.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/TransactionConfig.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/TransactionConfig.java index 540e3c537e0..05cc888dfb3 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/TransactionConfig.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/TransactionConfig.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.transaction; -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.transaction.impl.TransactionRetryStrategy; +import org.immutables.value.Value; @JsonDeserialize(as = ImmutableTransactionConfig.class) @JsonSerialize(as = ImmutableTransactionConfig.class) diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/encoding/TicketsEncodingStrategy.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/encoding/TicketsEncodingStrategy.java index 5c05b83beac..2f82b5da748 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/encoding/TicketsEncodingStrategy.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/encoding/TicketsEncodingStrategy.java @@ -16,12 +16,11 @@ package com.palantir.atlasdb.transaction.encoding; -import java.util.Arrays; - import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.table.description.ValueType; import com.palantir.atlasdb.transaction.impl.TransactionConstants; +import java.util.Arrays; /** * The ticketing algorithm distributes timestamps among rows and dynamic columns to avoid hot-spotting. diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractLockAwareTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractLockAwareTransactionManager.java index 9cdc26c8aed..8a23c9ca6b6 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractLockAwareTransactionManager.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractLockAwareTransactionManager.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.function.Supplier; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.cache.TimestampCache; @@ -25,6 +23,7 @@ import com.palantir.atlasdb.util.MetricsManager; import com.palantir.lock.HeldLocksToken; import com.palantir.lock.LockRequest; +import java.util.function.Supplier; public abstract class AbstractLockAwareTransactionManager extends AbstractConditionAwareTransactionManager { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AdvisoryLockConditionSuppliers.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AdvisoryLockConditionSuppliers.java index b542b4d67b8..7a006118582 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AdvisoryLockConditionSuppliers.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AdvisoryLockConditionSuppliers.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.Set; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.transaction.api.LockAcquisitionException; @@ -29,6 +23,10 @@ import com.palantir.lock.LockRequest; import com.palantir.lock.LockService; import com.palantir.logsafe.Preconditions; +import java.util.Set; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class AdvisoryLockConditionSuppliers { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchProvider.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchProvider.java index 7e11108bc96..7b84e3df0f6 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchProvider.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchProvider.java @@ -15,12 +15,10 @@ */ package com.palantir.atlasdb.transaction.impl; +import com.palantir.common.base.ClosableIterator; import java.util.List; - import javax.annotation.Nullable; -import com.palantir.common.base.ClosableIterator; - public interface BatchProvider { ClosableIterator getBatch(int batchSize, @Nullable byte[] lastToken); boolean hasNext(byte[] lastToken); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchSizeIncreasingIterator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchSizeIncreasingIterator.java index 26f888dbb5b..422f6c31c7f 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchSizeIncreasingIterator.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchSizeIncreasingIterator.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.List; - -import javax.annotation.Nullable; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; import com.palantir.atlasdb.AtlasDbPerformanceConstants; @@ -29,6 +22,10 @@ import com.palantir.common.base.ClosableIterators; import com.palantir.logsafe.Preconditions; import com.palantir.util.AssertUtils; +import java.util.List; +import javax.annotation.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class BatchSizeIncreasingIterator { private static final Logger log = LoggerFactory.getLogger(BatchSizeIncreasingIterator.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ColumnRangeBatchProvider.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ColumnRangeBatchProvider.java index 9c6f25fbf1f..4e451d3f325 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ColumnRangeBatchProvider.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ColumnRangeBatchProvider.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -import javax.annotation.Nullable; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection; @@ -33,6 +27,10 @@ import com.palantir.common.base.ClosableIterator; import com.palantir.common.base.ClosableIterators; import com.palantir.logsafe.Preconditions; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import javax.annotation.Nullable; public class ColumnRangeBatchProvider implements BatchProvider> { private final KeyValueService keyValueService; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/DefaultTaskExecutors.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/DefaultTaskExecutors.java index 47944d2e3a4..de3a96efa48 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/DefaultTaskExecutors.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/DefaultTaskExecutors.java @@ -16,16 +16,15 @@ package com.palantir.atlasdb.transaction.impl; +import com.google.common.annotations.VisibleForTesting; +import com.palantir.common.concurrent.NamedThreadFactory; +import com.palantir.common.concurrent.PTExecutors; import java.time.Duration; import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import com.google.common.annotations.VisibleForTesting; -import com.palantir.common.concurrent.NamedThreadFactory; -import com.palantir.common.concurrent.PTExecutors; - final class DefaultTaskExecutors { private static final Duration DEFAULT_IDLE_TIMEOUT = Duration.ofSeconds(5); private static final int SINGLE_THREAD = 1; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ExternalLocksCondition.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ExternalLocksCondition.java index 310d18909e4..ea5304d6d85 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ExternalLocksCondition.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ExternalLocksCondition.java @@ -15,19 +15,17 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.Sets; import com.palantir.atlasdb.transaction.api.TransactionLockTimeoutNonRetriableException; import com.palantir.lock.HeldLocksToken; import com.palantir.lock.LockRefreshToken; import com.palantir.lock.LockService; import com.palantir.logsafe.UnsafeArg; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ExternalLocksCondition implements AdvisoryLocksCondition { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/InstrumentedTimelockService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/InstrumentedTimelockService.java index 78518ccdf81..666827dfc60 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/InstrumentedTimelockService.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/InstrumentedTimelockService.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.Set; -import java.util.function.Supplier; - import com.codahale.metrics.Meter; import com.codahale.metrics.MetricRegistry; import com.palantir.atlasdb.AtlasDbMetricNames; @@ -30,6 +27,8 @@ import com.palantir.lock.v2.WaitForLocksRequest; import com.palantir.lock.v2.WaitForLocksResponse; import com.palantir.timestamp.TimestampRange; +import java.util.Set; +import java.util.function.Supplier; public class InstrumentedTimelockService implements TimelockService { private final TimelockService timelockService; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/PreCommitConditions.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/PreCommitConditions.java index 410048cda2f..14f3fb04e1a 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/PreCommitConditions.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/PreCommitConditions.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.transaction.impl; +import com.palantir.atlasdb.transaction.api.PreCommitCondition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.palantir.atlasdb.transaction.api.PreCommitCondition; - public final class PreCommitConditions { private static final Logger log = LoggerFactory.getLogger(PreCommitConditions.class); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ReadOnlyTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ReadOnlyTransactionManager.java index eed0c243cdf..d2142ec224f 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ReadOnlyTransactionManager.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ReadOnlyTransactionManager.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.function.Supplier; - import com.google.common.util.concurrent.MoreExecutors; import com.palantir.atlasdb.cache.TimestampCache; import com.palantir.atlasdb.cleaner.api.Cleaner; @@ -40,6 +38,7 @@ import com.palantir.lock.v2.TimelockService; import com.palantir.timestamp.TimestampManagementService; import com.palantir.timestamp.TimestampService; +import java.util.function.Supplier; public final class ReadOnlyTransactionManager extends AbstractLockAwareTransactionManager { private final MetricsManager metricsManager; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/RowRangeBatchProvider.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/RowRangeBatchProvider.java index 4199143f154..5e095c6f823 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/RowRangeBatchProvider.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/RowRangeBatchProvider.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.Arrays; -import java.util.List; - -import javax.annotation.Nullable; - import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.RangeRequest; import com.palantir.atlasdb.keyvalue.api.RangeRequests; @@ -28,6 +23,9 @@ import com.palantir.atlasdb.keyvalue.api.Value; import com.palantir.common.base.ClosableIterator; import com.palantir.logsafe.Preconditions; +import java.util.Arrays; +import java.util.List; +import javax.annotation.Nullable; public class RowRangeBatchProvider implements BatchProvider> { private final KeyValueService keyValueService; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransaction.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransaction.java index 12edea39604..7d64b7a8a34 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransaction.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransaction.java @@ -15,29 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.nio.ByteBuffer; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.NavigableMap; -import java.util.NoSuchElementException; -import java.util.Optional; -import java.util.Set; -import java.util.SortedMap; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ConcurrentNavigableMap; -import java.util.concurrent.ConcurrentSkipListMap; -import java.util.concurrent.ExecutorService; -import java.util.function.Supplier; - -import javax.annotation.Nullable; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Functions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -88,6 +65,26 @@ import com.palantir.lock.v2.TimelockService; import com.palantir.logsafe.Preconditions; import com.palantir.util.Pair; +import java.nio.ByteBuffer; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.NavigableMap; +import java.util.NoSuchElementException; +import java.util.Optional; +import java.util.Set; +import java.util.SortedMap; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ConcurrentNavigableMap; +import java.util.concurrent.ConcurrentSkipListMap; +import java.util.concurrent.ExecutorService; +import java.util.function.Supplier; +import javax.annotation.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class will track all reads to verify that there are no read-write conflicts at commit time. diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManager.java index 747ec286118..956c173c80e 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManager.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManager.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.Optional; -import java.util.Set; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; - import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; import com.palantir.async.initializer.Callback; @@ -51,6 +44,12 @@ import com.palantir.logsafe.exceptions.SafeIllegalStateException; import com.palantir.timestamp.TimestampManagementService; import com.palantir.timestamp.TimestampService; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; public class SerializableTransactionManager extends SnapshotTransactionManager { @@ -508,4 +507,3 @@ ConflictDetectionManager getConflictDetectionManager() { } } - diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ShouldNotDeleteAndRollbackTransaction.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ShouldNotDeleteAndRollbackTransaction.java index c9e100e8f6b..6e8ec505fe9 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ShouldNotDeleteAndRollbackTransaction.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ShouldNotDeleteAndRollbackTransaction.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.List; -import java.util.Optional; -import java.util.concurrent.AbstractExecutorService; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; - import com.palantir.atlasdb.cache.TimestampCache; import com.palantir.atlasdb.cleaner.NoOpCleaner; import com.palantir.atlasdb.keyvalue.api.KeyValueService; @@ -31,6 +24,12 @@ import com.palantir.atlasdb.transaction.api.TransactionReadSentinelBehavior; import com.palantir.atlasdb.transaction.service.TransactionService; import com.palantir.atlasdb.util.MetricsManager; +import java.util.List; +import java.util.Optional; +import java.util.concurrent.AbstractExecutorService; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; /** * This will read the values of all committed transactions. diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransaction.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransaction.java index eb3b47f8c42..da2edb13e79 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransaction.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransaction.java @@ -15,39 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Optional; -import java.util.Set; -import java.util.SortedMap; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ConcurrentNavigableMap; -import java.util.concurrent.ConcurrentSkipListMap; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.BiFunction; -import java.util.function.Supplier; -import java.util.stream.Stream; -import java.util.stream.StreamSupport; - -import javax.annotation.Nullable; - -import org.apache.commons.lang3.Validate; -import org.apache.commons.lang3.tuple.Pair; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.codahale.metrics.Histogram; import com.codahale.metrics.Meter; import com.codahale.metrics.Timer; @@ -146,6 +113,36 @@ import com.palantir.tracing.CloseableTracer; import com.palantir.util.AssertUtils; import com.palantir.util.paging.TokenBackedBasicResultsPage; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; +import java.util.Set; +import java.util.SortedMap; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ConcurrentNavigableMap; +import java.util.concurrent.ConcurrentSkipListMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.BiFunction; +import java.util.function.Supplier; +import java.util.stream.Stream; +import java.util.stream.StreamSupport; +import javax.annotation.Nullable; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.tuple.Pair; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This implements snapshot isolation for transactions. diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManager.java index 8f3822d754b..28647c0b191 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManager.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManager.java @@ -15,19 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.concurrent.Callable; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Supplier; - -import javax.validation.constraints.NotNull; - import com.codahale.metrics.Timer; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableSet; @@ -60,6 +47,17 @@ import com.palantir.logsafe.exceptions.SafeRuntimeException; import com.palantir.timestamp.TimestampManagementService; import com.palantir.timestamp.TimestampService; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.concurrent.Callable; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Supplier; +import javax.validation.constraints.NotNull; /* package */ class SnapshotTransactionManager extends AbstractLockAwareTransactionManager { private static final int NUM_RETRIES = 10; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionConflictDetectionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionConflictDetectionManager.java index 6ce725cf158..cdd5db4cd5a 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionConflictDetectionManager.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionConflictDetectionManager.java @@ -16,17 +16,15 @@ package com.palantir.atlasdb.transaction.impl; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.ConcurrentHashMap; - -import javax.annotation.Nullable; - import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.transaction.api.ConflictHandler; import com.palantir.logsafe.Preconditions; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.ConcurrentHashMap; +import javax.annotation.Nullable; public final class TransactionConflictDetectionManager { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionLocksCondition.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionLocksCondition.java index 3e1423875e7..831f65b4935 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionLocksCondition.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionLocksCondition.java @@ -15,15 +15,13 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.Collections; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.palantir.atlasdb.transaction.api.TransactionLockTimeoutException; import com.palantir.lock.HeldLocksToken; import com.palantir.lock.LockService; import com.palantir.logsafe.UnsafeArg; +import java.util.Collections; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TransactionLocksCondition implements AdvisoryLocksCondition { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/WrappingTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/WrappingTransactionManager.java index 436cb3eb7a0..57aec36b047 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/WrappingTransactionManager.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/WrappingTransactionManager.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.function.Supplier; - import com.palantir.atlasdb.transaction.api.AutoDelegate_TransactionManager; import com.palantir.atlasdb.transaction.api.ConditionAwareTransactionTask; import com.palantir.atlasdb.transaction.api.LockAwareTransactionTask; @@ -28,6 +26,7 @@ import com.palantir.atlasdb.transaction.api.TransactionTask; import com.palantir.lock.HeldLocksToken; import com.palantir.lock.LockRequest; +import java.util.function.Supplier; public abstract class WrappingTransactionManager implements AutoDelegate_TransactionManager { private final TransactionManager delegate; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/consistency/TimestampCorroborationConsistencyCheck.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/consistency/TimestampCorroborationConsistencyCheck.java index 1b2ca20b1e1..22ec9c9314d 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/consistency/TimestampCorroborationConsistencyCheck.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/consistency/TimestampCorroborationConsistencyCheck.java @@ -15,16 +15,14 @@ */ package com.palantir.atlasdb.transaction.impl.consistency; -import java.util.function.ToLongFunction; - -import org.immutables.value.Value; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.palantir.atlasdb.factory.ImmutableTransactionManagerConsistencyResult; import com.palantir.atlasdb.factory.TransactionManagerConsistencyResult; import com.palantir.atlasdb.transaction.api.TransactionManager; import com.palantir.logsafe.SafeArg; +import java.util.function.ToLongFunction; +import org.immutables.value.Value; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Compares a source of fresh timestamps against a conservative lower bound that should always be strictly lower than diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/consistency/TransactionManagerConsistencyCheck.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/consistency/TransactionManagerConsistencyCheck.java index 037cb928f3b..598199b968c 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/consistency/TransactionManagerConsistencyCheck.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/consistency/TransactionManagerConsistencyCheck.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.transaction.impl.consistency; -import java.util.function.Function; - import com.palantir.atlasdb.factory.TransactionManagerConsistencyResult; import com.palantir.atlasdb.transaction.api.TransactionManager; +import java.util.function.Function; public interface TransactionManagerConsistencyCheck extends Function { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcome.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcome.java index 9920914a71e..5b380b7e31d 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcome.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcome.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.transaction.impl.metrics; -import java.util.function.Supplier; - import com.palantir.atlasdb.transaction.api.LockAwareTransactionTask; import com.palantir.atlasdb.transaction.api.TransactionManager; import com.palantir.atlasdb.transaction.service.TransactionService; +import java.util.function.Supplier; /** * A TransactionOutcome describes an outcome resulting from a transaction. Note that a single transaction can diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetrics.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetrics.java index 2d05c0c3328..4ca24f28228 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetrics.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetrics.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.transaction.impl.metrics; -import java.util.Map; -import java.util.function.Predicate; - import com.codahale.metrics.Meter; import com.codahale.metrics.MetricRegistry; import com.google.common.annotations.VisibleForTesting; @@ -26,6 +23,8 @@ import com.palantir.atlasdb.logging.LoggingArgs; import com.palantir.atlasdb.util.MetricsManager; import com.palantir.tritium.metrics.registry.MetricName; +import java.util.Map; +import java.util.function.Predicate; /** * Tracks various states of an AtlasDB transaction, and marks associated meters in the diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/PreStartHandlingTransactionService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/PreStartHandlingTransactionService.java index 99e0c2c0e1b..4284e3133b5 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/PreStartHandlingTransactionService.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/PreStartHandlingTransactionService.java @@ -16,19 +16,17 @@ package com.palantir.atlasdb.transaction.service; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.StreamSupport; - -import javax.annotation.CheckForNull; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; +import javax.annotation.CheckForNull; /** * This service handles queries for timestamps before {@link AtlasDbConstants#STARTING_TS} @@ -76,7 +74,8 @@ public Map get(Iterable startTimestamps) { @Override public void putUnlessExists(long startTimestamp, long commitTimestamp) throws KeyAlreadyExistsException { if (!isTimestampValid(startTimestamp)) { - throw new SafeIllegalStateException("Attempted to putUnlessExists({}, {}) which is disallowed.", + throw new SafeIllegalStateException("Attempted to putUnlessExists which is disallowed for the given start " + + "timestamp.", SafeArg.of("startTimestamp", startTimestamp), SafeArg.of("commitTimestamp", commitTimestamp)); } diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SimpleTransactionService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SimpleTransactionService.java index 7c6bb9ffd87..cdd52e89b91 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SimpleTransactionService.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SimpleTransactionService.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.transaction.service; -import java.util.HashMap; -import java.util.Map; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.palantir.atlasdb.keyvalue.api.Cell; @@ -28,6 +25,8 @@ import com.palantir.atlasdb.transaction.encoding.TimestampEncodingStrategy; import com.palantir.atlasdb.transaction.encoding.V1EncodingStrategy; import com.palantir.atlasdb.transaction.impl.TransactionConstants; +import java.util.HashMap; +import java.util.Map; public final class SimpleTransactionService implements EncodingTransactionService { private final KeyValueService kvs; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SplitKeyDelegatingTransactionService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SplitKeyDelegatingTransactionService.java index c383e367d8e..3efed3acb5f 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SplitKeyDelegatingTransactionService.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SplitKeyDelegatingTransactionService.java @@ -16,20 +16,18 @@ package com.palantir.atlasdb.transaction.service; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.function.Function; - -import javax.annotation.CheckForNull; - import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.function.Function; +import javax.annotation.CheckForNull; /** * A {@link SplitKeyDelegatingTransactionService} delegates between multiple {@link TransactionService}s, depending @@ -75,8 +73,8 @@ public Map get(Iterable startTimestamps) { Set unknownKeys = Sets.difference(queryMap.keySet(), keyedServices.keySet()); if (!unknownKeys.isEmpty()) { - throw new SafeIllegalStateException("A batch of timestamps {} produced some transaction service keys which" - + " are unknown: {}. Known transaction service keys were {}.", + throw new SafeIllegalStateException("A batch of timestamps produced some transaction service keys which" + + " are unknown.", SafeArg.of("timestamps", startTimestamps), SafeArg.of("unknownKeys", unknownKeys), SafeArg.of("knownServiceKeys", keyedServices.keySet())); @@ -109,8 +107,7 @@ private Optional getServiceForTimestamp(long startTimestamp) TransactionService service = keyedServices.get(key); if (service == null) { - throw new SafeIllegalStateException("Could not find a transaction service for timestamp {}, which" - + " produced a key of {}. Known transaction service keys were {}.", + throw new SafeIllegalStateException("Could not find a transaction service for the given timestamp", SafeArg.of("timestamp", startTimestamp), SafeArg.of("serviceKey", key), SafeArg.of("knownServiceKeys", keyedServices.keySet())); diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionKvsWrapper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionKvsWrapper.java index f90a1477e6b..657f306eac2 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionKvsWrapper.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionKvsWrapper.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.transaction.service; -import java.util.HashMap; -import java.util.Map; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.palantir.atlasdb.keyvalue.api.Cell; @@ -25,6 +22,8 @@ import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.Value; import com.palantir.atlasdb.transaction.impl.TransactionConstants; +import java.util.HashMap; +import java.util.Map; public class TransactionKvsWrapper { // The maximum key-value store timestamp (exclusive) at which data is stored in transaction table. diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/WriteBatchingTransactionService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/WriteBatchingTransactionService.java index a17d8f3e89a..2cc9f13be8f 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/WriteBatchingTransactionService.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/WriteBatchingTransactionService.java @@ -16,19 +16,6 @@ package com.palantir.atlasdb.transaction.service; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ExecutionException; -import java.util.stream.Collectors; - -import javax.annotation.CheckForNull; - -import org.immutables.value.Value; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; @@ -47,6 +34,16 @@ import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ExecutionException; +import java.util.stream.Collectors; +import javax.annotation.CheckForNull; +import org.immutables.value.Value; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class coalesces write (that is, put-unless-exists) requests to an underlying {@link EncodingTransactionService}, diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/lock/SingleLockService.java b/atlasdb-impl-shared/src/main/java/com/palantir/lock/SingleLockService.java index aca90887aeb..1a0e0ed2c86 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/lock/SingleLockService.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/lock/SingleLockService.java @@ -15,12 +15,6 @@ */ package com.palantir.lock; -import java.util.Set; - -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSortedMap; import com.palantir.atlasdb.keyvalue.api.TableReference; @@ -28,6 +22,10 @@ import com.palantir.logsafe.Arg; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; +import java.util.Set; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("checkstyle:FinalClass") // Used for mocking public class SingleLockService implements AutoCloseable { diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStoreTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStoreTest.java index 312d3f34012..12fd12327c6 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStoreTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStoreTest.java @@ -22,17 +22,15 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import java.util.Map; - -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mockito; - import com.google.common.collect.ImmutableMap; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.RangeRequest; import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; +import java.util.Map; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mockito; public class KeyValueServicePuncherStoreTest { private static final long TIMESTAMP_1 = 10L; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStoreTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStoreTest.java index 7cdf8df40c6..e496c1acbdd 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStoreTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStoreTest.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.cleaner; -import java.util.List; -import java.util.SortedMap; - -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; @@ -36,6 +28,12 @@ import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; import com.palantir.common.base.BatchingVisitable; import com.palantir.common.base.BatchingVisitables; +import java.util.List; +import java.util.SortedMap; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; public class KeyValueServiceScrubberStoreTest { private KeyValueService kvs; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/ScrubberTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/ScrubberTest.java index dcaa9c2baa1..31768bd8049 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/ScrubberTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/ScrubberTest.java @@ -20,18 +20,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.util.Collection; -import java.util.List; -import java.util.SortedMap; -import java.util.function.Function; - -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; @@ -45,6 +33,16 @@ import com.palantir.atlasdb.transaction.service.SimpleTransactionService; import com.palantir.atlasdb.transaction.service.TransactionService; import com.palantir.common.base.BatchingVisitables; +import java.util.Collection; +import java.util.List; +import java.util.SortedMap; +import java.util.function.Function; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; @RunWith(Parameterized.class) public class ScrubberTest { diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/SimplePuncherTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/SimplePuncherTest.java index 374f66adab1..819ce3de5fd 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/SimplePuncherTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/SimplePuncherTest.java @@ -20,9 +20,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.junit.Test; - import com.palantir.common.time.Clock; +import org.junit.Test; public class SimplePuncherTest { @Test diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/compact/BackgroundCompactorTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/compact/BackgroundCompactorTest.java index 4fd74cd5fb9..ec9196ef7d8 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/compact/BackgroundCompactorTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/compact/BackgroundCompactorTest.java @@ -23,13 +23,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import java.util.Optional; -import java.util.function.Supplier; -import java.util.stream.Stream; - -import org.junit.Before; -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.transaction.api.TransactionManager; @@ -37,6 +30,11 @@ import com.palantir.atlasdb.util.MetricsManagers; import com.palantir.lock.LockService; import com.palantir.lock.SingleLockService; +import java.util.Optional; +import java.util.function.Supplier; +import java.util.stream.Stream; +import org.junit.Before; +import org.junit.Test; public class BackgroundCompactorTest { private static final String TABLE_STRING = "ns.table"; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/compact/CompactPriorityCalculatorTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/compact/CompactPriorityCalculatorTest.java index 407048fc4f0..771ecc284db 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/compact/CompactPriorityCalculatorTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/compact/CompactPriorityCalculatorTest.java @@ -19,13 +19,11 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.util.Optional; - -import org.junit.Test; - import com.google.common.collect.ImmutableMap; import com.palantir.atlasdb.transaction.api.Transaction; import com.palantir.atlasdb.transaction.api.TransactionManager; +import java.util.Optional; +import org.junit.Test; public class CompactPriorityCalculatorTest { private static final String TABLE_1 = "table1"; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/InternalSchemaConfigTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/InternalSchemaConfigTest.java index 5ba0b28cbab..ceaa9850924 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/InternalSchemaConfigTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/InternalSchemaConfigTest.java @@ -19,9 +19,8 @@ import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.Test; - import com.palantir.atlasdb.transaction.impl.TransactionConstants; +import org.junit.Test; // In these tests we confirm if config is buildable, so we're interested in exceptions (or lack thereof). @SuppressWarnings("ResultOfMethodCallIgnored") diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TimestampPartitioningMapTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TimestampPartitioningMapTest.java index 3648fcaa658..b34faee79c5 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TimestampPartitioningMapTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TimestampPartitioningMapTest.java @@ -19,10 +19,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; -import org.junit.Test; - import com.google.common.collect.ImmutableRangeMap; import com.google.common.collect.Range; +import org.junit.Test; public class TimestampPartitioningMapTest { private static final TimestampPartitioningMap DEFAULT_INITIAL_MAPPING diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaInstallerTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaInstallerTest.java index fbbbb548dd5..bdcfb16aef9 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaInstallerTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaInstallerTest.java @@ -28,7 +28,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; - import org.jmock.lib.concurrent.DeterministicScheduler; import org.junit.After; import org.junit.Test; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerAggressiveConcurrentUpdateTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerAggressiveConcurrentUpdateTest.java index 2f5c3e3093b..c3fb9e3e5d8 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerAggressiveConcurrentUpdateTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerAggressiveConcurrentUpdateTest.java @@ -18,6 +18,17 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.google.common.collect.Lists; +import com.google.common.collect.Range; +import com.google.common.collect.RangeMap; +import com.google.common.util.concurrent.Futures; +import com.palantir.atlasdb.coordination.ValueAndBound; +import com.palantir.atlasdb.internalschema.persistence.CoordinationServices; +import com.palantir.atlasdb.keyvalue.api.KeyValueService; +import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; +import com.palantir.atlasdb.util.MetricsManagers; +import com.palantir.timestamp.InMemoryTimestampService; +import com.palantir.timestamp.TimestampService; import java.util.Comparator; import java.util.List; import java.util.Optional; @@ -30,21 +41,8 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.IntStream; - import org.junit.Test; -import com.google.common.collect.Lists; -import com.google.common.collect.Range; -import com.google.common.collect.RangeMap; -import com.google.common.util.concurrent.Futures; -import com.palantir.atlasdb.coordination.ValueAndBound; -import com.palantir.atlasdb.internalschema.persistence.CoordinationServices; -import com.palantir.atlasdb.keyvalue.api.KeyValueService; -import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; -import com.palantir.atlasdb.util.MetricsManagers; -import com.palantir.timestamp.InMemoryTimestampService; -import com.palantir.timestamp.TimestampService; - public class TransactionSchemaManagerAggressiveConcurrentUpdateTest { private static final int NUM_THREADS = 8; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerIntegrationTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerIntegrationTest.java index 1548f418afb..a9ad24c1438 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerIntegrationTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerIntegrationTest.java @@ -19,15 +19,14 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.Before; -import org.junit.Test; - import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.internalschema.persistence.CoordinationServices; import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; import com.palantir.atlasdb.util.MetricsManagers; import com.palantir.timestamp.InMemoryTimestampService; import com.palantir.timestamp.TimestampService; +import org.junit.Before; +import org.junit.Test; public class TransactionSchemaManagerIntegrationTest { private static final long ONE_HUNDRED_MILLION = 100_000_000; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerTest.java index e8586153ab7..4a1fb6aed7a 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerTest.java @@ -20,16 +20,14 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.mock; -import java.util.Optional; - -import org.junit.Test; - import com.google.common.collect.ImmutableRangeMap; import com.google.common.collect.Range; import com.palantir.atlasdb.coordination.CoordinationService; import com.palantir.atlasdb.coordination.ValueAndBound; import com.palantir.atlasdb.transaction.impl.TransactionConstants; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.util.Optional; +import org.junit.Test; @SuppressWarnings("unchecked") // Mocks of generic types public class TransactionSchemaManagerTest { diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/metrics/MetadataCoordinationServiceMetricsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/metrics/MetadataCoordinationServiceMetricsTest.java index b072e664238..e7079d8353e 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/metrics/MetadataCoordinationServiceMetricsTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/metrics/MetadataCoordinationServiceMetricsTest.java @@ -22,11 +22,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import java.util.Optional; - -import org.junit.Before; -import org.junit.Test; - import com.codahale.metrics.Gauge; import com.codahale.metrics.MetricRegistry; import com.google.common.collect.BoundType; @@ -40,6 +35,9 @@ import com.palantir.atlasdb.util.MetricsManager; import com.palantir.atlasdb.util.MetricsManagers; import com.palantir.timestamp.TimestampService; +import java.util.Optional; +import org.junit.Before; +import org.junit.Test; @SuppressWarnings("unchecked") // Mocks public class MetadataCoordinationServiceMetricsTest { diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/persistence/InternalSchemaMetadataPayloadCodecTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/persistence/InternalSchemaMetadataPayloadCodecTest.java index 635bdf2f4fc..28f2b2aff40 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/persistence/InternalSchemaMetadataPayloadCodecTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/persistence/InternalSchemaMetadataPayloadCodecTest.java @@ -19,20 +19,18 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import com.google.common.collect.ImmutableRangeMap; +import com.google.common.collect.Range; +import com.palantir.atlasdb.internalschema.InternalSchemaMetadata; +import com.palantir.atlasdb.internalschema.TimestampPartitioningMap; +import com.palantir.conjure.java.serialization.ObjectMappers; import java.io.IOException; import java.net.URISyntaxException; import java.nio.file.Files; import java.nio.file.Paths; import java.util.Objects; - import org.junit.Test; -import com.google.common.collect.ImmutableRangeMap; -import com.google.common.collect.Range; -import com.palantir.atlasdb.internalschema.InternalSchemaMetadata; -import com.palantir.atlasdb.internalschema.TimestampPartitioningMap; -import com.palantir.conjure.java.serialization.ObjectMappers; - public class InternalSchemaMetadataPayloadCodecTest { private static final InternalSchemaMetadata INTERNAL_SCHEMA_METADATA = InternalSchemaMetadata.builder() .timestampToTransactionsTableSchemaVersion( diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/persistence/VersionedInternalSchemaMetadataTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/persistence/VersionedInternalSchemaMetadataTest.java index 201cd3419ea..5c35ee24743 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/persistence/VersionedInternalSchemaMetadataTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/persistence/VersionedInternalSchemaMetadataTest.java @@ -24,7 +24,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Objects; - import org.junit.Test; public class VersionedInternalSchemaMetadataTest { diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/api/WriteReferencePersisterTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/api/WriteReferencePersisterTest.java index 5431d126f44..56f4ff740aa 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/api/WriteReferencePersisterTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/api/WriteReferencePersisterTest.java @@ -17,13 +17,11 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.nio.charset.StandardCharsets; - -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; import com.palantir.atlasdb.ptobject.EncodingUtils; import com.palantir.atlasdb.sweep.queue.id.SweepTableIndices; +import java.nio.charset.StandardCharsets; +import org.junit.Test; public final class WriteReferencePersisterTest { private static final TableReference TABLE = TableReference.create( diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/KvTableMappingServiceTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/KvTableMappingServiceTest.java index 52b8634f5dc..c886979589e 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/KvTableMappingServiceTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/KvTableMappingServiceTest.java @@ -26,12 +26,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import java.util.Map; -import java.util.concurrent.atomic.AtomicLong; - -import org.junit.Before; -import org.junit.Test; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; @@ -41,6 +35,10 @@ import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.TableReference; +import java.util.Map; +import java.util.concurrent.atomic.AtomicLong; +import org.junit.Before; +import org.junit.Test; public class KvTableMappingServiceTest { private static final TableReference FQ_TABLE = TableReference.createFromFullyQualifiedName("test.test"); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueServiceTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueServiceTest.java index da10873d5a1..6fcce9ee62d 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueServiceTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueServiceTest.java @@ -18,18 +18,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.atomic.AtomicLong; -import java.util.stream.Collectors; - -import org.junit.Test; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.util.concurrent.Futures; @@ -43,6 +31,16 @@ import com.palantir.atlasdb.table.description.TableDefinition; import com.palantir.atlasdb.table.description.ValueType; import com.palantir.atlasdb.transaction.api.ConflictHandler; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicLong; +import java.util.stream.Collectors; +import org.junit.Test; public class TableRemappingKeyValueServiceTest { private static final Namespace NAMESPACE = Namespace.create("namespace"); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfigTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfigTest.java index 4f7437b5c54..b8d3ee348b4 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfigTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfigTest.java @@ -17,9 +17,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.palantir.atlasdb.spi.KeyValueServiceConfigHelper; +import org.junit.Test; public class InMemoryAtlasDbConfigTest { private static final InMemoryAtlasDbConfig CONFIG_1 = new InMemoryAtlasDbConfig(); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactoryTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactoryTest.java index 8c62c171e72..fa58b64eb2d 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactoryTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactoryTest.java @@ -18,13 +18,11 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.util.Optional; - -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.spi.AtlasDbFactory; import com.palantir.timestamp.TimestampService; +import java.util.Optional; +import org.junit.Test; public class InMemoryAtlasDbFactoryTest { private final AtlasDbFactory factory = new InMemoryAtlasDbFactory(); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/monitoring/TimestampTrackerTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/monitoring/TimestampTrackerTest.java index 7e1c179dea9..6f0994fca61 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/monitoring/TimestampTrackerTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/monitoring/TimestampTrackerTest.java @@ -21,11 +21,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Supplier; - -import org.junit.Test; - import com.codahale.metrics.Clock; import com.codahale.metrics.Gauge; import com.codahale.metrics.MetricRegistry; @@ -34,6 +29,9 @@ import com.palantir.atlasdb.util.MetricsManager; import com.palantir.atlasdb.util.MetricsManagers; import com.palantir.lock.v2.TimelockService; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Supplier; +import org.junit.Test; public class TimestampTrackerTest { private static final long ONE = 1L; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/monitoring/TrackerUtilsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/monitoring/TrackerUtilsTest.java index 13cb2c427e1..69e44bc49b2 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/monitoring/TrackerUtilsTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/monitoring/TrackerUtilsTest.java @@ -22,15 +22,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import com.codahale.metrics.Clock; +import com.codahale.metrics.Gauge; import java.util.function.Supplier; - import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.codahale.metrics.Clock; -import com.codahale.metrics.Gauge; - @SuppressWarnings("unchecked") // Mocks of known types public class TrackerUtilsTest { private static final Logger log = LoggerFactory.getLogger(TrackerUtilsTest.class); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockServiceClientTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockServiceClientTest.java index 08c787e3e9a..f765188cb50 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockServiceClientTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockServiceClientTest.java @@ -18,20 +18,16 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import java.util.UUID; - -import javax.ws.rs.core.Response; - -import org.junit.After; -import org.junit.ClassRule; -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; import com.palantir.atlasdb.util.TestJaxRsClientFactory; import com.palantir.conjure.java.api.errors.RemoteException; import com.palantir.conjure.java.server.jersey.ConjureJerseyFeature; - import io.dropwizard.testing.junit.DropwizardClientRule; +import java.util.UUID; +import javax.ws.rs.core.Response; +import org.junit.After; +import org.junit.ClassRule; +import org.junit.Test; public class KvsBackedPersistentLockServiceClientTest { private static final String REASON = "some-reason"; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockServiceTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockServiceTest.java index a87b1b324b3..e526b57e864 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockServiceTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockServiceTest.java @@ -21,13 +21,12 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import org.junit.Before; -import org.junit.Test; - import com.google.common.collect.Iterables; import com.palantir.atlasdb.keyvalue.api.CheckAndSetException; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; +import org.junit.Before; +import org.junit.Test; public class KvsBackedPersistentLockServiceTest { private static final String TEST_REASON = "for-test"; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/LockEntryTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/LockEntryTest.java index 845eecd6923..8dafe6e2742 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/LockEntryTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/LockEntryTest.java @@ -18,13 +18,6 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.Iterator; -import java.util.UUID; - -import org.junit.Test; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableSet; @@ -38,6 +31,11 @@ import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.api.Value; import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Iterator; +import java.util.UUID; +import org.junit.Test; public class LockEntryTest { private static final ObjectMapper MAPPER = new ObjectMapper(); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/LockStoreTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/LockStoreTest.java index aba89436fe1..726bebb9a83 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/LockStoreTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/LockStoreTest.java @@ -25,16 +25,14 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import java.util.Set; -import java.util.UUID; - -import org.junit.Before; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.CheckAndSetException; import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; +import java.util.Set; +import java.util.UUID; +import org.junit.Before; +import org.junit.Test; public class LockStoreTest { private static final String REASON = "reason"; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/PersistentLockServiceClientTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/PersistentLockServiceClientTest.java index d14944b71fa..803761760f3 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/PersistentLockServiceClientTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/PersistentLockServiceClientTest.java @@ -18,20 +18,16 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import java.util.UUID; - -import javax.ws.rs.core.Response; - -import org.junit.After; -import org.junit.ClassRule; -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; import com.palantir.atlasdb.util.TestJaxRsClientFactory; import com.palantir.conjure.java.api.errors.RemoteException; import com.palantir.conjure.java.server.jersey.ConjureJerseyFeature; - import io.dropwizard.testing.junit.DropwizardClientRule; +import java.util.UUID; +import javax.ws.rs.core.Response; +import org.junit.After; +import org.junit.ClassRule; +import org.junit.Test; public class PersistentLockServiceClientTest { private static final String REASON = "some-reason"; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/schema/KeyValueServiceMigratorsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/schema/KeyValueServiceMigratorsTest.java index 3dc0c505742..eb562fafef5 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/schema/KeyValueServiceMigratorsTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/schema/KeyValueServiceMigratorsTest.java @@ -18,18 +18,16 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import java.util.Set; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.keyvalue.api.TableReference; +import java.util.Set; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class KeyValueServiceMigratorsTest { diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/schema/KeyValueServiceValidatorsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/schema/KeyValueServiceValidatorsTest.java index c35870ddba2..0f2eb12cae7 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/schema/KeyValueServiceValidatorsTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/schema/KeyValueServiceValidatorsTest.java @@ -17,8 +17,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.KeyValueService; @@ -27,6 +25,7 @@ import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; import com.palantir.atlasdb.schema.generated.SweepPriorityTable; import com.palantir.atlasdb.transaction.impl.TransactionTables; +import org.junit.Test; public class KeyValueServiceValidatorsTest { private static final TableReference SWEEP_PRIORITY = TableReference.create( diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSourceTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSourceTest.java index 1232655eb5f..9a051d58483 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSourceTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSourceTest.java @@ -24,12 +24,10 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.junit.Assert.assertThat; +import com.palantir.atlasdb.util.MetricsManagers; import java.util.function.Function; - import org.junit.Test; -import com.palantir.atlasdb.util.MetricsManagers; - /** * Created by tboam on 03/11/2017. */ diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/BackgroundSweeperFastTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/BackgroundSweeperFastTest.java index fe53012bcc1..e0f6d9d7d9f 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/BackgroundSweeperFastTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/BackgroundSweeperFastTest.java @@ -18,20 +18,18 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; -import java.util.Optional; - -import org.assertj.core.api.Assertions; -import org.assertj.core.data.Percentage; -import org.junit.Test; -import org.mockito.ArgumentCaptor; -import org.mockito.Mockito; - import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.SweepResults; import com.palantir.atlasdb.sweep.priority.ImmutableSweepPriorityOverrideConfig; import com.palantir.atlasdb.sweep.priority.ImmutableUpdateSweepPriority; import com.palantir.atlasdb.sweep.progress.ImmutableSweepProgress; import com.palantir.atlasdb.sweep.progress.SweepProgress; +import java.util.Optional; +import org.assertj.core.api.Assertions; +import org.assertj.core.data.Percentage; +import org.junit.Test; +import org.mockito.ArgumentCaptor; +import org.mockito.Mockito; public class BackgroundSweeperFastTest extends SweeperTestSetup { diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CellsSweeperShould.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CellsSweeperShould.java index bbf7045d9de..7defd7d04d6 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CellsSweeperShould.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CellsSweeperShould.java @@ -26,12 +26,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import java.nio.charset.StandardCharsets; -import java.util.Set; - -import org.junit.Test; -import org.mockito.InOrder; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; @@ -42,6 +36,10 @@ import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.transaction.api.Transaction; +import java.nio.charset.StandardCharsets; +import java.util.Set; +import org.junit.Test; +import org.mockito.InOrder; public class CellsSweeperShould { private static final TableReference TABLE_REFERENCE = TableReference.create(Namespace.create("ns"), "testTable"); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CellsToSweepPartitioningIteratorTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CellsToSweepPartitioningIteratorTest.java index 49089433f8d..549230185e0 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CellsToSweepPartitioningIteratorTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CellsToSweepPartitioningIteratorTest.java @@ -17,17 +17,15 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.util.ArrayList; -import java.util.List; - -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.primitives.Ints; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.RangeRequests; +import java.util.ArrayList; +import java.util.List; +import org.junit.Test; public class CellsToSweepPartitioningIteratorTest { @Test(expected = IllegalArgumentException.class) diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CommitTsCacheTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CommitTsCacheTest.java index 3a904491f24..5d756345c6f 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CommitTsCacheTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CommitTsCacheTest.java @@ -27,22 +27,20 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import com.google.common.collect.Sets; +import com.palantir.atlasdb.AtlasDbConstants; +import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException; +import com.palantir.atlasdb.transaction.impl.TransactionConstants; +import com.palantir.atlasdb.transaction.service.TransactionService; import java.util.Collection; import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Collectors; import java.util.stream.LongStream; - import org.junit.Test; import org.mockito.invocation.InvocationOnMock; -import com.google.common.collect.Sets; -import com.palantir.atlasdb.AtlasDbConstants; -import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException; -import com.palantir.atlasdb.transaction.impl.TransactionConstants; -import com.palantir.atlasdb.transaction.service.TransactionService; - public class CommitTsCacheTest { private static final Long VALID_START_TIMESTAMP = 100L; private static final Long VALID_COMMIT_TIMESTAMP = 200L; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/ExaminedCellLimitTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/ExaminedCellLimitTest.java index b0fff3c7847..c212746b038 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/ExaminedCellLimitTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/ExaminedCellLimitTest.java @@ -18,9 +18,8 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.api.Cell; +import org.junit.Test; public class ExaminedCellLimitTest { private String startingRow; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/PersistentLockManagerTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/PersistentLockManagerTest.java index 07f97f6d544..33a829c7c54 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/PersistentLockManagerTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/PersistentLockManagerTest.java @@ -31,14 +31,6 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import java.util.UUID; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -import org.junit.Before; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.Cell; @@ -51,8 +43,13 @@ import com.palantir.atlasdb.persistentlock.PersistentLockService; import com.palantir.atlasdb.util.MetricsManager; import com.palantir.atlasdb.util.MetricsManagers; - +import java.util.UUID; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import net.jcip.annotations.GuardedBy; +import org.junit.Before; +import org.junit.Test; public class PersistentLockManagerTest { private static final PersistentLockId FIRST_LOCK_ID = PersistentLockId.fromString("2-4-6-0-1"); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepTimestampTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepTimestampTest.java index a52dd61f961..9cd299ed3fe 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepTimestampTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepTimestampTest.java @@ -19,12 +19,10 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.palantir.atlasdb.sweep.queue.SpecialTimestampsSupplier; import java.util.function.LongSupplier; - import org.junit.Test; -import com.palantir.atlasdb.sweep.queue.SpecialTimestampsSupplier; - public class SweepTimestampTest { private final LongSupplier mockImmutableTimestampSupplier = mock(LongSupplier.class); private final LongSupplier mockUnreadableTimestampSupplier = mock(LongSupplier.class); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepableCellFilterParametrizedTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepableCellFilterParametrizedTest.java index 769deb810ad..4d2967a0b4d 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepableCellFilterParametrizedTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepableCellFilterParametrizedTest.java @@ -20,6 +20,15 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; +import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping; +import com.palantir.atlasdb.keyvalue.api.Cell; +import com.palantir.atlasdb.keyvalue.api.ImmutableCandidateCellForSweeping; +import com.palantir.atlasdb.transaction.impl.TransactionConstants; +import com.palantir.atlasdb.transaction.service.TransactionService; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collection; @@ -28,22 +37,11 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; -import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping; -import com.palantir.atlasdb.keyvalue.api.Cell; -import com.palantir.atlasdb.keyvalue.api.ImmutableCandidateCellForSweeping; -import com.palantir.atlasdb.transaction.impl.TransactionConstants; -import com.palantir.atlasdb.transaction.service.TransactionService; - @RunWith(Parameterized.class) public class SweepableCellFilterParametrizedTest { private static final Set BOOLEANS = ImmutableSet.of(true, false); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepableCellFilterTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepableCellFilterTest.java index ef8096cf52c..16328645131 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepableCellFilterTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepableCellFilterTest.java @@ -20,11 +20,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.nio.charset.StandardCharsets; -import java.util.List; - -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; @@ -34,6 +29,9 @@ import com.palantir.atlasdb.keyvalue.api.Value; import com.palantir.atlasdb.transaction.impl.TransactionConstants; import com.palantir.atlasdb.transaction.service.TransactionService; +import java.nio.charset.StandardCharsets; +import java.util.List; +import org.junit.Test; public class SweepableCellFilterTest { private static final long LOW_START_TS = 6L; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweeperServiceImplTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweeperServiceImplTest.java index 1553c9fd331..f385697bb7c 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweeperServiceImplTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweeperServiceImplTest.java @@ -25,18 +25,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import java.util.List; -import java.util.Optional; - -import javax.ws.rs.core.Response; - -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.mockito.ArgumentCaptor; -import org.mockito.Mockito; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.io.BaseEncoding; @@ -47,6 +35,15 @@ import com.palantir.atlasdb.util.TestJaxRsClientFactory; import com.palantir.conjure.java.api.errors.RemoteException; import com.palantir.conjure.java.server.jersey.ConjureJerseyFeature; +import java.util.List; +import java.util.Optional; +import javax.ws.rs.core.Response; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.mockito.ArgumentCaptor; +import org.mockito.Mockito; public class SweeperServiceImplTest extends SweeperTestSetup { diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweeperTestSetup.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweeperTestSetup.java index 5ab71b63cf9..0732c8f4ec1 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweeperTestSetup.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweeperTestSetup.java @@ -22,13 +22,6 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import java.util.Optional; -import java.util.concurrent.CountDownLatch; - -import org.junit.Before; -import org.junit.BeforeClass; -import org.mockito.stubbing.Answer; - import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.SweepResults; import com.palantir.atlasdb.keyvalue.api.TableReference; @@ -46,6 +39,11 @@ import com.palantir.atlasdb.util.MetricsManagers; import com.palantir.lock.LockService; import com.palantir.lock.SingleLockService; +import java.util.Optional; +import java.util.concurrent.CountDownLatch; +import org.junit.Before; +import org.junit.BeforeClass; +import org.mockito.stubbing.Answer; public class SweeperTestSetup { protected static final TableReference TABLE_REF = TableReference.createFromFullyQualifiedName( diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/LegacySweepMetricsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/LegacySweepMetricsTest.java index b551fa01273..c734a1d84dd 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/LegacySweepMetricsTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/LegacySweepMetricsTest.java @@ -20,17 +20,15 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.junit.Assert.assertThat; -import java.util.List; - -import org.junit.Before; -import org.junit.Test; - import com.codahale.metrics.Counter; import com.codahale.metrics.Gauge; import com.codahale.metrics.MetricRegistry; import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.AtlasDbMetricNames; import com.palantir.atlasdb.keyvalue.api.SweepResults; +import java.util.List; +import org.junit.Before; +import org.junit.Test; public class LegacySweepMetricsTest { private static final long EXAMINED = 15L; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/SweepMetricsAssert.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/SweepMetricsAssert.java index c37a38a0612..07147b5a530 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/SweepMetricsAssert.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/SweepMetricsAssert.java @@ -15,17 +15,6 @@ */ package com.palantir.atlasdb.sweep.metrics; -import java.util.Map; - -import javax.annotation.CheckReturnValue; - -import org.assertj.core.api.AbstractAssert; -import org.assertj.core.api.WritableAssertionInfo; -import org.assertj.core.data.Offset; -import org.assertj.core.internal.Doubles; -import org.assertj.core.internal.LongArrays; -import org.assertj.core.internal.Objects; - import com.codahale.metrics.Gauge; import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.Snapshot; @@ -36,6 +25,14 @@ import com.palantir.atlasdb.util.MetricsManager; import com.palantir.atlasdb.util.SlidingWindowMeanGauge; import com.palantir.tritium.metrics.registry.MetricName; +import java.util.Map; +import javax.annotation.CheckReturnValue; +import org.assertj.core.api.AbstractAssert; +import org.assertj.core.api.WritableAssertionInfo; +import org.assertj.core.data.Offset; +import org.assertj.core.internal.Doubles; +import org.assertj.core.internal.LongArrays; +import org.assertj.core.internal.Objects; public final class SweepMetricsAssert extends AbstractAssert { private final MetricsManager metrics; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/SweepOutcomeMetricsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/SweepOutcomeMetricsTest.java index 43f6605cc8d..5c5ce85c46b 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/SweepOutcomeMetricsTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/SweepOutcomeMetricsTest.java @@ -15,23 +15,20 @@ */ package com.palantir.atlasdb.sweep.metrics; -import static org.mockito.Mockito.mock; - import static com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy.CONSERVATIVE; import static com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy.THOROUGH; import static com.palantir.atlasdb.sweep.metrics.SweepMetricsAssert.assertThat; - -import java.util.Arrays; -import java.util.stream.IntStream; - -import org.junit.Before; -import org.junit.Test; +import static org.mockito.Mockito.mock; import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; import com.palantir.atlasdb.sweep.queue.ShardAndStrategy; import com.palantir.atlasdb.util.MetricsManager; import com.palantir.atlasdb.util.MetricsManagers; import com.palantir.lock.v2.TimelockService; +import java.util.Arrays; +import java.util.stream.IntStream; +import org.junit.Before; +import org.junit.Test; public class SweepOutcomeMetricsTest { private MetricsManager metricsManager; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/TargetedSweepMetricsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/TargetedSweepMetricsTest.java index 3f863b89bc6..414fcd089ee 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/TargetedSweepMetricsTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/TargetedSweepMetricsTest.java @@ -15,20 +15,13 @@ */ package com.palantir.atlasdb.sweep.metrics; +import static com.palantir.atlasdb.sweep.metrics.SweepMetricsAssert.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static com.palantir.atlasdb.sweep.metrics.SweepMetricsAssert.assertThat; - -import java.util.concurrent.TimeUnit; - -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mockito; - import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.cleaner.KeyValueServicePuncherStore; import com.palantir.atlasdb.cleaner.PuncherStore; @@ -38,6 +31,10 @@ import com.palantir.atlasdb.sweep.queue.ShardAndStrategy; import com.palantir.atlasdb.util.MetricsManager; import com.palantir.atlasdb.util.MetricsManagers; +import java.util.concurrent.TimeUnit; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mockito; public class TargetedSweepMetricsTest { private static final long RECOMPUTE_MILLIS = 10; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/priority/NextTableToSweepProviderTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/priority/NextTableToSweepProviderTest.java index 69fe4bc3a3c..d55e65c1c2a 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/priority/NextTableToSweepProviderTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/priority/NextTableToSweepProviderTest.java @@ -24,6 +24,14 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.palantir.atlasdb.keyvalue.api.Namespace; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.sweep.TableToSweep; +import com.palantir.lock.LockRefreshToken; +import com.palantir.lock.LockRequest; +import com.palantir.lock.LockService; import java.math.BigInteger; import java.util.HashMap; import java.util.HashSet; @@ -32,20 +40,10 @@ import java.util.Optional; import java.util.Set; import java.util.stream.IntStream; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.palantir.atlasdb.keyvalue.api.Namespace; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.atlasdb.sweep.TableToSweep; -import com.palantir.lock.LockRefreshToken; -import com.palantir.lock.LockRequest; -import com.palantir.lock.LockService; - public class NextTableToSweepProviderTest { private NextTableToSweepProvider provider; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/priority/StreamStoreRemappingSweepPriorityCalculatorTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/priority/StreamStoreRemappingSweepPriorityCalculatorTest.java index 7c0986f0baf..f1348d1ac36 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/priority/StreamStoreRemappingSweepPriorityCalculatorTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/priority/StreamStoreRemappingSweepPriorityCalculatorTest.java @@ -22,6 +22,11 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.palantir.atlasdb.AtlasDbConstants; +import com.palantir.atlasdb.keyvalue.api.KeyValueService; +import com.palantir.atlasdb.keyvalue.api.Namespace; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.schema.stream.StreamTableType; import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.Arrays; @@ -29,17 +34,10 @@ import java.util.List; import java.util.Map; import java.util.Set; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.palantir.atlasdb.AtlasDbConstants; -import com.palantir.atlasdb.keyvalue.api.KeyValueService; -import com.palantir.atlasdb.keyvalue.api.Namespace; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.atlasdb.schema.stream.StreamTableType; - public class StreamStoreRemappingSweepPriorityCalculatorTest { private static final long THIRTY_MINUTES_AGO = ZonedDateTime.now().minusMinutes(30).toInstant().toEpochMilli(); private static final long TWO_HOURS_AGO = ZonedDateTime.now().minusHours(2).toInstant().toEpochMilli(); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/AbstractSweepQueueTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/AbstractSweepQueueTest.java index 9bbb262c7da..cc5009f1f80 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/AbstractSweepQueueTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/AbstractSweepQueueTest.java @@ -17,14 +17,6 @@ import static org.mockito.Mockito.spy; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Before; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.Cell; @@ -42,6 +34,12 @@ import com.palantir.atlasdb.transaction.service.TransactionServices; import com.palantir.atlasdb.util.MetricsManager; import com.palantir.atlasdb.util.MetricsManagers; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import org.assertj.core.api.Assertions; +import org.junit.After; +import org.junit.Before; public abstract class AbstractSweepQueueTest { static final TableReference TABLE_CONS = TableReference.createFromFullyQualifiedName("test.conservative"); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/ShardAndStrategyTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/ShardAndStrategyTest.java index 9b407f8f150..e6f64f1364f 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/ShardAndStrategyTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/ShardAndStrategyTest.java @@ -17,9 +17,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.Test; - import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; +import org.junit.Test; public class ShardAndStrategyTest { diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/ShardProgressTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/ShardProgressTest.java index 526015e3249..8f5e81a28b7 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/ShardProgressTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/ShardProgressTest.java @@ -23,9 +23,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.junit.Before; -import org.junit.Test; - import com.google.common.collect.ImmutableMap; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.Cell; @@ -35,6 +32,8 @@ import com.palantir.atlasdb.keyvalue.api.Value; import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; import com.palantir.atlasdb.schema.generated.SweepShardProgressTable; +import org.junit.Before; +import org.junit.Test; public class ShardProgressTest { private static final long INITIAL_TIMESTAMP = SweepQueueUtils.INITIAL_TIMESTAMP; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepBatchAccumulatorTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepBatchAccumulatorTest.java index 48854913ee5..dfd922d5336 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepBatchAccumulatorTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepBatchAccumulatorTest.java @@ -19,19 +19,17 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.LongStream; - -import org.junit.Before; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.encoding.PtBytes; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.schema.generated.SweepableCellsTable; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.LongStream; +import org.junit.Before; +import org.junit.Test; public class SweepBatchAccumulatorTest { private static final long SWEEP_TIMESTAMP = 3141592L; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepBatchWithPartitionInfoTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepBatchWithPartitionInfoTest.java index 5c4ec066572..ea806ab5e95 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepBatchWithPartitionInfoTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepBatchWithPartitionInfoTest.java @@ -20,12 +20,10 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.google.common.collect.ImmutableSet; import java.util.Set; - import org.junit.Test; -import com.google.common.collect.ImmutableSet; - public class SweepBatchWithPartitionInfoTest { private final SweepBatch batch = mock(SweepBatch.class); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepableCellsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepableCellsTest.java index 4e94120bef4..7a658a77f5a 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepableCellsTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepableCellsTest.java @@ -15,6 +15,12 @@ */ package com.palantir.atlasdb.sweep.queue; +import static com.palantir.atlasdb.sweep.queue.ShardAndStrategy.conservative; +import static com.palantir.atlasdb.sweep.queue.ShardAndStrategy.thorough; +import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.MAX_CELLS_DEDICATED; +import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.MAX_CELLS_GENERIC; +import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.SWEEP_BATCH_SIZE; +import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.tsPartitionFine; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; @@ -24,23 +30,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static com.palantir.atlasdb.sweep.queue.ShardAndStrategy.conservative; -import static com.palantir.atlasdb.sweep.queue.ShardAndStrategy.thorough; -import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.MAX_CELLS_DEDICATED; -import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.MAX_CELLS_GENERIC; -import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.SWEEP_BATCH_SIZE; -import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.tsPartitionFine; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.LongStream; - -import org.junit.Before; -import org.junit.Test; -import org.mockito.ArgumentCaptor; - import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.Multimap; @@ -53,6 +42,14 @@ import com.palantir.atlasdb.sweep.metrics.SweepMetricsAssert; import com.palantir.atlasdb.sweep.metrics.TargetedSweepMetrics; import com.palantir.lock.v2.TimelockService; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.LongStream; +import org.junit.Before; +import org.junit.Test; +import org.mockito.ArgumentCaptor; public class SweepableCellsTest extends AbstractSweepQueueTest { private static final long SMALL_SWEEP_TS = TS + 200L; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepableTimestampsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepableTimestampsTest.java index 2f29cf975f0..423986418c2 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepableTimestampsTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepableTimestampsTest.java @@ -15,22 +15,19 @@ */ package com.palantir.atlasdb.sweep.queue; -import static org.assertj.core.api.Assertions.assertThat; - import static com.palantir.atlasdb.sweep.queue.ShardAndStrategy.conservative; import static com.palantir.atlasdb.sweep.queue.ShardAndStrategy.thorough; import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.TS_FINE_GRANULARITY; import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.maxTsForFinePartition; import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.minTsForFinePartition; import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.tsPartitionFine; +import static org.assertj.core.api.Assertions.assertThat; +import com.palantir.atlasdb.sweep.Sweeper; import java.util.Optional; - import org.junit.Before; import org.junit.Test; -import com.palantir.atlasdb.sweep.Sweeper; - public class SweepableTimestampsTest extends AbstractSweepQueueTest { private ShardProgress progress; private SweepableTimestamps sweepableTimestamps; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperLockTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperLockTest.java index a670f7bd8d7..e4a82a30360 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperLockTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperLockTest.java @@ -23,15 +23,13 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import java.util.Optional; -import java.util.UUID; - -import org.junit.Test; - import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.lock.v2.LockToken; import com.palantir.lock.v2.TimelockService; +import java.util.Optional; +import java.util.UUID; +import org.junit.Test; public class TargetedSweeperLockTest { private TimelockService mockLockService = mock(TimelockService.class); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperNumShardSupplierTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperNumShardSupplierTest.java index 6e7923845c4..b00bba41df4 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperNumShardSupplierTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperNumShardSupplierTest.java @@ -23,14 +23,12 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.util.function.Supplier; - -import org.junit.Before; -import org.junit.Test; - import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; +import java.util.function.Supplier; +import org.junit.Before; +import org.junit.Test; public class TargetedSweeperNumShardSupplierTest { private KeyValueService kvs; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperTest.java index e6cd47570e3..5f9dcecddf1 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperTest.java @@ -15,6 +15,18 @@ */ package com.palantir.atlasdb.sweep.queue; +import static com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy.CONSERVATIVE; +import static com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy.THOROUGH; +import static com.palantir.atlasdb.sweep.metrics.SweepMetricsAssert.assertThat; +import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.BATCH_SIZE_KVS; +import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.MAX_CELLS_GENERIC; +import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.SWEEP_BATCH_SIZE; +import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.TS_COARSE_GRANULARITY; +import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.TS_FINE_GRANULARITY; +import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.maxTsForFinePartition; +import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.minTsForCoarsePartition; +import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.minTsForFinePartition; +import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.tsPartitionFine; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; @@ -30,38 +42,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy.CONSERVATIVE; -import static com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy.THOROUGH; -import static com.palantir.atlasdb.sweep.metrics.SweepMetricsAssert.assertThat; -import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.BATCH_SIZE_KVS; -import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.MAX_CELLS_GENERIC; -import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.SWEEP_BATCH_SIZE; -import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.TS_COARSE_GRANULARITY; -import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.TS_FINE_GRANULARITY; -import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.maxTsForFinePartition; -import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.minTsForCoarsePartition; -import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.minTsForFinePartition; -import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.tsPartitionFine; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Supplier; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - -import org.eclipse.jetty.util.ConcurrentHashSet; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.mockito.ArgumentCaptor; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -96,6 +76,23 @@ import com.palantir.lock.v2.LockResponse; import com.palantir.lock.v2.LockToken; import com.palantir.lock.v2.TimelockService; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import org.eclipse.jetty.util.ConcurrentHashSet; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.mockito.ArgumentCaptor; @RunWith(Parameterized.class) public class TargetedSweeperTest extends AbstractSweepQueueTest { diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/WriteInfoPartitionerTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/WriteInfoPartitionerTest.java index 43dcd91b26d..c3b1aeb5312 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/WriteInfoPartitionerTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/WriteInfoPartitionerTest.java @@ -15,6 +15,7 @@ */ package com.palantir.atlasdb.sweep.queue; +import static com.palantir.atlasdb.sweep.queue.AbstractSweepQueueTest.metadataBytes; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; @@ -24,15 +25,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import static com.palantir.atlasdb.sweep.queue.AbstractSweepQueueTest.metadataBytes; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.junit.Before; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; @@ -43,6 +35,11 @@ import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import org.junit.Before; +import org.junit.Test; public class WriteInfoPartitionerTest { private static final TableReference NOTHING = getTableRef("nothing"); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/WriteInfoTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/WriteInfoTest.java index 9f411a2a58e..3dc742f12d6 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/WriteInfoTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/WriteInfoTest.java @@ -17,11 +17,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.sweep.Sweeper; +import org.junit.Test; public class WriteInfoTest { private static final TableReference TABLE_REF = TableReference.createFromFullyQualifiedName("test.test"); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/clear/DefaultConservativeSweepWatermarkStoreTests.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/clear/DefaultConservativeSweepWatermarkStoreTests.java index c69a183805a..5d9fae52a37 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/clear/DefaultConservativeSweepWatermarkStoreTests.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/clear/DefaultConservativeSweepWatermarkStoreTests.java @@ -18,9 +18,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Before; -import org.junit.Test; - import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.Namespace; @@ -28,6 +25,8 @@ import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; import com.palantir.atlasdb.schema.TargetedSweepSchema; import com.palantir.atlasdb.table.description.Schemas; +import org.junit.Before; +import org.junit.Test; public class DefaultConservativeSweepWatermarkStoreTests { private static final TableReference TABLE = TableReference.create(Namespace.create("foo"), "bar"); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/clear/DefaultTableClearerTests.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/clear/DefaultTableClearerTests.java index dad5f3a0725..117cdbfeb7c 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/clear/DefaultTableClearerTests.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/clear/DefaultTableClearerTests.java @@ -21,12 +21,6 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -37,6 +31,11 @@ import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy; import com.palantir.atlasdb.sweep.queue.WriteInfo; import com.palantir.atlasdb.table.description.TableMetadata; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public final class DefaultTableClearerTests { diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/IdsToNamesTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/IdsToNamesTest.java index 2f8728e81cb..9d7083e53ea 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/IdsToNamesTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/IdsToNamesTest.java @@ -17,12 +17,11 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; +import org.junit.Test; public final class IdsToNamesTest { private final KeyValueService kvs = new InMemoryKeyValueService(true); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/NamesToIdsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/NamesToIdsTest.java index e08055eda7b..2cfaf93a57e 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/NamesToIdsTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/NamesToIdsTest.java @@ -18,12 +18,11 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; +import org.junit.Test; public final class NamesToIdsTest { private static final TableReference TABLE = TableReference.create(Namespace.create("namespace"), "table"); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIndicesTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIndicesTest.java index 7a7547f18ee..2059c606201 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIndicesTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIndicesTest.java @@ -18,14 +18,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import java.util.NoSuchElementException; - -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; +import java.util.NoSuchElementException; +import org.junit.Test; public class SweepTableIndicesTest { private final KeyValueService kvs = new InMemoryKeyValueService(true); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/encoding/TicketsEncodingStrategyTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/encoding/TicketsEncodingStrategyTest.java index a9d17c052f5..b541a06a710 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/encoding/TicketsEncodingStrategyTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/encoding/TicketsEncodingStrategyTest.java @@ -19,6 +19,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; +import com.google.protobuf.ByteString; +import com.palantir.atlasdb.encoding.PtBytes; +import com.palantir.atlasdb.keyvalue.api.Cell; +import com.palantir.atlasdb.transaction.impl.TransactionConstants; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -27,14 +31,8 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.LongStream; - import org.junit.Test; -import com.google.protobuf.ByteString; -import com.palantir.atlasdb.encoding.PtBytes; -import com.palantir.atlasdb.keyvalue.api.Cell; -import com.palantir.atlasdb.transaction.impl.TransactionConstants; - public class TicketsEncodingStrategyTest { private static final TicketsEncodingStrategy STRATEGY = TicketsEncodingStrategy.INSTANCE; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/AdvisoryLocksConditionTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/AdvisoryLocksConditionTest.java index 2a960cf09e5..f1b21a5447b 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/AdvisoryLocksConditionTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/AdvisoryLocksConditionTest.java @@ -22,14 +22,6 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import java.math.BigInteger; -import java.util.Collections; -import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; - -import org.junit.Before; -import org.junit.Test; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; import com.palantir.atlasdb.transaction.api.LockAcquisitionException; @@ -47,6 +39,12 @@ import com.palantir.lock.SimpleTimeDuration; import com.palantir.lock.SortedLockCollection; import com.palantir.lock.TimeDuration; +import java.math.BigInteger; +import java.util.Collections; +import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; +import org.junit.Before; +import org.junit.Test; public class AdvisoryLocksConditionTest { diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/DefaultTaskExecutorsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/DefaultTaskExecutorsTest.java index 9fc118e399c..838e45874b4 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/DefaultTaskExecutorsTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/DefaultTaskExecutorsTest.java @@ -18,14 +18,12 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; +import com.google.common.util.concurrent.Uninterruptibles; import java.util.concurrent.ExecutorService; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; - import org.junit.Test; -import com.google.common.util.concurrent.Uninterruptibles; - public class DefaultTaskExecutorsTest { @Test public void deleteExecutorHasBoundedTaskQueue() { diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/LockCheckingTransactionTaskTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/LockCheckingTransactionTaskTest.java index 2a3b940485c..101480309ac 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/LockCheckingTransactionTaskTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/LockCheckingTransactionTaskTest.java @@ -25,11 +25,6 @@ import static org.mockito.Mockito.when; import static org.mockito.internal.verification.VerificationModeFactory.times; -import java.util.Set; - -import org.junit.Before; -import org.junit.Test; - import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.transaction.api.Transaction; import com.palantir.atlasdb.transaction.api.TransactionFailedNonRetriableException; @@ -37,6 +32,9 @@ import com.palantir.atlasdb.transaction.api.TransactionTask; import com.palantir.lock.v2.LockToken; import com.palantir.lock.v2.TimelockService; +import java.util.Set; +import org.junit.Before; +import org.junit.Test; public class LockCheckingTransactionTaskTest { private final TimelockService timelockService = mock(TimelockService.class); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManagerTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManagerTest.java index 43ef1f64cab..ae765849ba6 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManagerTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManagerTest.java @@ -28,15 +28,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; - -import org.awaitility.Awaitility; -import org.jmock.lib.concurrent.DeterministicScheduler; -import org.junit.Before; -import org.junit.Test; - import com.palantir.async.initializer.AsyncInitializer; import com.palantir.async.initializer.Callback; import com.palantir.atlasdb.cache.DefaultTimestampCache; @@ -53,6 +44,13 @@ import com.palantir.exception.NotInitializedException; import com.palantir.lock.v2.TimelockService; import com.palantir.timestamp.TimestampManagementService; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import org.awaitility.Awaitility; +import org.jmock.lib.concurrent.DeterministicScheduler; +import org.junit.Before; +import org.junit.Test; public class SerializableTransactionManagerTest { private static final long THREE = 3L; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManagerTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManagerTest.java index d26ccc84f5c..982f3e4f427 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManagerTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManagerTest.java @@ -27,14 +27,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.io.IOException; -import java.math.BigInteger; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -import org.junit.Test; -import org.mockito.InOrder; - import com.codahale.metrics.MetricRegistry; import com.palantir.atlasdb.cache.DefaultTimestampCache; import com.palantir.atlasdb.cleaner.api.Cleaner; @@ -52,6 +44,12 @@ import com.palantir.lock.impl.LegacyTimelockService; import com.palantir.lock.v2.TimelockService; import com.palantir.timestamp.InMemoryTimestampService; +import java.io.IOException; +import java.math.BigInteger; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import org.junit.Test; +import org.mockito.InOrder; public class SnapshotTransactionManagerTest { private static final String SETUP_TASK_METRIC_NAME = diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionConflictDetectionManagerTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionConflictDetectionManagerTest.java index 051f9afd21b..8285afd2be5 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionConflictDetectionManagerTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionConflictDetectionManagerTest.java @@ -16,26 +16,23 @@ package com.palantir.atlasdb.transaction.impl; +import static com.palantir.logsafe.testing.Assertions.assertThatLoggableExceptionThrownBy; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.when; -import static com.palantir.logsafe.testing.Assertions.assertThatLoggableExceptionThrownBy; - -import javax.annotation.Nullable; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - import com.google.common.cache.CacheLoader; import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.transaction.api.ConflictHandler; import com.palantir.logsafe.exceptions.SafeIllegalStateException; import com.palantir.logsafe.exceptions.SafeNullPointerException; +import javax.annotation.Nullable; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public final class TransactionConflictDetectionManagerTest { diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/consistency/TimestampCorroborationConsistencyCheckTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/consistency/TimestampCorroborationConsistencyCheckTest.java index ea1e1461ee7..5a53fd69459 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/consistency/TimestampCorroborationConsistencyCheckTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/consistency/TimestampCorroborationConsistencyCheckTest.java @@ -18,13 +18,11 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import java.util.function.ToLongFunction; - -import org.junit.Test; - import com.palantir.atlasdb.factory.ImmutableTransactionManagerConsistencyResult; import com.palantir.atlasdb.factory.TransactionManagerConsistencyResult; import com.palantir.atlasdb.transaction.api.TransactionManager; +import java.util.function.ToLongFunction; +import org.junit.Test; public class TimestampCorroborationConsistencyCheckTest { private static final RuntimeException EXCEPTION = new IllegalStateException("bad"); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/PreStartHandlingTransactionServiceTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/PreStartHandlingTransactionServiceTest.java index 98220719ed6..cceb913dc10 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/PreStartHandlingTransactionServiceTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/PreStartHandlingTransactionServiceTest.java @@ -26,19 +26,17 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import java.util.List; -import java.util.Map; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.util.List; +import java.util.Map; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; public class PreStartHandlingTransactionServiceTest { private final TransactionService delegate = mock(TransactionService.class); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/ReadOnlyTransactionServiceIntegrationTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/ReadOnlyTransactionServiceIntegrationTest.java index 5e62e9748ee..ab41e70924b 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/ReadOnlyTransactionServiceIntegrationTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/ReadOnlyTransactionServiceIntegrationTest.java @@ -18,13 +18,12 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; import com.palantir.atlasdb.util.MetricsManagers; import com.palantir.timestamp.InMemoryTimestampService; +import org.junit.Test; public class ReadOnlyTransactionServiceIntegrationTest { private static final long COORDINATION_QUANTUM = 100_000_000L; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/SplitKeyDelegatingTransactionServiceTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/SplitKeyDelegatingTransactionServiceTest.java index 486136322cb..c5fac122dc6 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/SplitKeyDelegatingTransactionServiceTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/SplitKeyDelegatingTransactionServiceTest.java @@ -23,18 +23,16 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.math.LongMath; import java.util.Map; import java.util.function.Function; - import org.junit.After; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.math.LongMath; - @SuppressWarnings("unchecked") // Mocking public class SplitKeyDelegatingTransactionServiceTest { private static final Function EXTRACT_LAST_DIGIT = num -> LongMath.mod(num, 10L); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/TransactionServicesTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/TransactionServicesTest.java index 320d6e9129d..69074e19538 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/TransactionServicesTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/TransactionServicesTest.java @@ -24,14 +24,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import org.awaitility.Awaitility; -import org.junit.Before; -import org.junit.Test; -import org.mockito.ArgumentCaptor; - import com.palantir.atlasdb.coordination.CoordinationService; import com.palantir.atlasdb.internalschema.InternalSchemaMetadata; import com.palantir.atlasdb.internalschema.TransactionSchemaManager; @@ -50,6 +42,12 @@ import com.palantir.timestamp.InMemoryTimestampService; import com.palantir.timestamp.TimestampManagementService; import com.palantir.timestamp.TimestampService; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import org.awaitility.Awaitility; +import org.junit.Before; +import org.junit.Test; +import org.mockito.ArgumentCaptor; public class TransactionServicesTest { private final KeyValueService keyValueService = spy(new InMemoryKeyValueService(false)); diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/WriteBatchingTransactionServiceTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/WriteBatchingTransactionServiceTest.java index de1771b8d97..2439119a470 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/WriteBatchingTransactionServiceTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/WriteBatchingTransactionServiceTest.java @@ -30,17 +30,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import java.util.List; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - -import org.immutables.value.Value; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.SettableFuture; @@ -51,6 +40,15 @@ import com.palantir.atlasdb.transaction.encoding.V1EncodingStrategy; import com.palantir.common.annotation.Output; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import org.immutables.value.Value; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; public class WriteBatchingTransactionServiceTest { private static final V1EncodingStrategy ENCODING_STRATEGY = V1EncodingStrategy.INSTANCE; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/util/DropwizardClientRule.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/util/DropwizardClientRule.java index e929bf7801e..f0af37f5791 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/util/DropwizardClientRule.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/util/DropwizardClientRule.java @@ -15,13 +15,8 @@ */ package com.palantir.atlasdb.util; -import java.net.URI; - -import org.junit.rules.ExternalResource; - import com.codahale.metrics.health.HealthCheck; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; - import io.dropwizard.Application; import io.dropwizard.Configuration; import io.dropwizard.jetty.HttpConnectorFactory; @@ -29,6 +24,8 @@ import io.dropwizard.setup.Bootstrap; import io.dropwizard.setup.Environment; import io.dropwizard.testing.DropwizardTestSupport; +import java.net.URI; +import org.junit.rules.ExternalResource; /** * Copied from {@link io.dropwizard.testing.junit.DropwizardClientRule} so that we can configure the ObjectMapper. diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/util/TestJaxRsClientFactory.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/util/TestJaxRsClientFactory.java index ab19dfff06e..5d9e7ca5648 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/util/TestJaxRsClientFactory.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/util/TestJaxRsClientFactory.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.util; -import java.nio.file.Paths; - import com.google.common.collect.ImmutableList; import com.palantir.conjure.java.api.config.service.UserAgents; import com.palantir.conjure.java.api.config.ssl.SslConfiguration; @@ -25,8 +23,8 @@ import com.palantir.conjure.java.client.jaxrs.JaxRsClient; import com.palantir.conjure.java.config.ssl.SslSocketFactories; import com.palantir.conjure.java.okhttp.NoOpHostEventsSink; - import io.dropwizard.testing.ResourceHelpers; +import java.nio.file.Paths; public final class TestJaxRsClientFactory { private TestJaxRsClientFactory() { diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/lock/SimpleLocksTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/lock/SimpleLocksTest.java index 0a5d0cbd001..418efbf5ed4 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/lock/SimpleLocksTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/lock/SimpleLocksTest.java @@ -25,14 +25,12 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import java.math.BigInteger; - import org.junit.Before; import org.junit.Test; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; - public class SimpleLocksTest { private SingleLockService lockService; private LockService mockLockService = mock(LockService.class); diff --git a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcKeyValueSharedTest.java b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcKeyValueSharedTest.java index 95fb3aaf57e..e9e639e4989 100644 --- a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcKeyValueSharedTest.java +++ b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcKeyValueSharedTest.java @@ -17,11 +17,10 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.ClassRule; -import org.junit.Test; - import com.palantir.atlasdb.keyvalue.impl.AbstractKeyValueServiceTest; import com.palantir.atlasdb.keyvalue.impl.TestResourceManager; +import org.junit.ClassRule; +import org.junit.Test; public class JdbcKeyValueSharedTest extends AbstractKeyValueServiceTest { @ClassRule diff --git a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcSweepTaskRunnerTest.java b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcSweepTaskRunnerTest.java index 287d56e393e..cae747b1b62 100644 --- a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcSweepTaskRunnerTest.java +++ b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcSweepTaskRunnerTest.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.jdbc; -import org.junit.After; -import org.junit.ClassRule; - import com.palantir.atlasdb.keyvalue.impl.TestResourceManager; import com.palantir.atlasdb.sweep.AbstractSweepTaskRunnerTest; +import org.junit.After; +import org.junit.ClassRule; public class JdbcSweepTaskRunnerTest extends AbstractSweepTaskRunnerTest { @ClassRule diff --git a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTests.java b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTests.java index eccdefebc14..a4ee9de9696 100644 --- a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTests.java +++ b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTests.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.jdbc; -import java.io.File; -import java.util.Properties; - import com.palantir.atlasdb.jdbc.config.ImmutableHikariDataSourceConfiguration; import com.palantir.atlasdb.keyvalue.jdbc.ImmutableJdbcKeyValueConfiguration; import com.palantir.atlasdb.keyvalue.jdbc.JdbcKeyValueConfiguration; import com.palantir.atlasdb.keyvalue.jdbc.JdbcKeyValueService; +import java.io.File; +import java.util.Properties; public class JdbcTests { diff --git a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTimestampBoundStoreTest.java b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTimestampBoundStoreTest.java index 515fd7f48bf..a87b02230bf 100644 --- a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTimestampBoundStoreTest.java +++ b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTimestampBoundStoreTest.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.jdbc; -import org.junit.After; - import com.palantir.atlasdb.keyvalue.jdbc.JdbcKeyValueService; import com.palantir.atlasdb.keyvalue.jdbc.JdbcTimestampBoundStore; import com.palantir.atlasdb.timestamp.AbstractDbTimestampBoundStoreTest; import com.palantir.timestamp.TimestampBoundStore; +import org.junit.After; public class JdbcTimestampBoundStoreTest extends AbstractDbTimestampBoundStoreTest { private JdbcKeyValueService kvs; diff --git a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTransactionTest.java b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTransactionTest.java index 81fecaddf83..7ded6fb2f6a 100644 --- a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTransactionTest.java +++ b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTransactionTest.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.jdbc; -import org.junit.ClassRule; - import com.palantir.atlasdb.keyvalue.impl.TestResourceManager; import com.palantir.atlasdb.transaction.impl.AbstractTransactionTest; +import org.junit.ClassRule; public class JdbcTransactionTest extends AbstractTransactionTest { @ClassRule diff --git a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/jdbc/config/JdbcDataSourceConfiguration.java b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/jdbc/config/JdbcDataSourceConfiguration.java index 0041b46af22..2c59d1e1080 100644 --- a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/jdbc/config/JdbcDataSourceConfiguration.java +++ b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/jdbc/config/JdbcDataSourceConfiguration.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.jdbc.config; -import javax.sql.DataSource; - import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo.As; import com.fasterxml.jackson.annotation.JsonTypeInfo.Id; +import javax.sql.DataSource; @JsonTypeInfo(use = Id.NAME, include = As.PROPERTY, property = "type") public interface JdbcDataSourceConfiguration { diff --git a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcAtlasDbFactory.java b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcAtlasDbFactory.java index dd38528f3be..acf5bac855e 100644 --- a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcAtlasDbFactory.java +++ b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcAtlasDbFactory.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.jdbc; -import java.util.Optional; -import java.util.function.LongSupplier; -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.auto.service.AutoService; import com.google.common.base.Preconditions; import com.palantir.atlasdb.AtlasDbConstants; @@ -35,6 +28,11 @@ import com.palantir.atlasdb.versions.AtlasDbVersion; import com.palantir.timestamp.ManagedTimestampService; import com.palantir.timestamp.PersistentTimestampServiceImpl; +import java.util.Optional; +import java.util.function.LongSupplier; +import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @AutoService(AtlasDbFactory.class) public class JdbcAtlasDbFactory implements AtlasDbFactory { diff --git a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueConfiguration.java b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueConfiguration.java index ed5c62fc385..f1114f7fa5a 100644 --- a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueConfiguration.java +++ b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueConfiguration.java @@ -15,10 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.jdbc; -import java.util.Optional; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -29,6 +25,8 @@ import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.spi.KeyValueServiceConfig; import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; +import java.util.Optional; +import org.immutables.value.Value; @AutoService(KeyValueServiceConfig.class) @JsonDeserialize(as = ImmutableJdbcKeyValueConfiguration.class) diff --git a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueService.java b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueService.java index 624479dfb90..5776c27e544 100644 --- a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueService.java +++ b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueService.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.keyvalue.jdbc; -import static org.jooq.Clause.TABLE_VALUES; -import static org.jooq.impl.DSL.field; -import static org.jooq.impl.DSL.row; -import static org.jooq.impl.DSL.table; -import static org.jooq.impl.SQLDataType.BIGINT; -import static org.jooq.impl.SQLDataType.BLOB; -import static org.jooq.impl.SQLDataType.VARBINARY; -import static org.jooq.impl.SQLDataType.VARCHAR; - import static com.palantir.atlasdb.keyvalue.jdbc.impl.JdbcConstants.ATLAS_TABLE; import static com.palantir.atlasdb.keyvalue.jdbc.impl.JdbcConstants.A_COL_NAME; import static com.palantir.atlasdb.keyvalue.jdbc.impl.JdbcConstants.A_ROW_NAME; @@ -48,46 +39,14 @@ import static com.palantir.atlasdb.keyvalue.jdbc.impl.JdbcConstants.TEMP_TABLE_2; import static com.palantir.atlasdb.keyvalue.jdbc.impl.JdbcConstants.TIMESTAMP; import static com.palantir.atlasdb.keyvalue.jdbc.impl.JdbcConstants.VALUE; - -import java.io.Closeable; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Collection; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.NavigableMap; -import java.util.Set; -import java.util.SortedMap; - -import javax.sql.DataSource; - -import org.jooq.BatchBindStep; -import org.jooq.Condition; -import org.jooq.DSLContext; -import org.jooq.InsertValuesStep4; -import org.jooq.Query; -import org.jooq.Record; -import org.jooq.Record1; -import org.jooq.RenderContext; -import org.jooq.Result; -import org.jooq.Row; -import org.jooq.Row3; -import org.jooq.RowN; -import org.jooq.SQLDialect; -import org.jooq.Select; -import org.jooq.SelectField; -import org.jooq.SelectOffsetStep; -import org.jooq.Table; -import org.jooq.TableLike; -import org.jooq.conf.RenderNameStyle; -import org.jooq.conf.Settings; -import org.jooq.exception.DataAccessException; -import org.jooq.impl.DSL; +import static org.jooq.Clause.TABLE_VALUES; +import static org.jooq.impl.DSL.field; +import static org.jooq.impl.DSL.row; +import static org.jooq.impl.DSL.table; +import static org.jooq.impl.SQLDataType.BIGINT; +import static org.jooq.impl.SQLDataType.BLOB; +import static org.jooq.impl.SQLDataType.VARBINARY; +import static org.jooq.impl.SQLDataType.VARCHAR; import com.google.common.base.Function; import com.google.common.base.MoreObjects; @@ -140,6 +99,43 @@ import com.palantir.util.paging.AbstractPagingIterable; import com.palantir.util.paging.SimpleTokenBackedResultsPage; import com.palantir.util.paging.TokenBackedBasicResultsPage; +import java.io.Closeable; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.NavigableMap; +import java.util.Set; +import java.util.SortedMap; +import javax.sql.DataSource; +import org.jooq.BatchBindStep; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.InsertValuesStep4; +import org.jooq.Query; +import org.jooq.Record; +import org.jooq.Record1; +import org.jooq.RenderContext; +import org.jooq.Result; +import org.jooq.Row; +import org.jooq.Row3; +import org.jooq.RowN; +import org.jooq.SQLDialect; +import org.jooq.Select; +import org.jooq.SelectField; +import org.jooq.SelectOffsetStep; +import org.jooq.Table; +import org.jooq.TableLike; +import org.jooq.conf.RenderNameStyle; +import org.jooq.conf.Settings; +import org.jooq.exception.DataAccessException; +import org.jooq.impl.DSL; public class JdbcKeyValueService implements KeyValueService { private final int rowBatchSize; diff --git a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcTimestampBoundStore.java b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcTimestampBoundStore.java index 670bd443eea..b40a930b7e7 100644 --- a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcTimestampBoundStore.java +++ b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcTimestampBoundStore.java @@ -18,6 +18,10 @@ import static org.jooq.impl.SQLDataType.BIGINT; import static org.jooq.impl.SQLDataType.INTEGER; +import com.google.common.base.Function; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.timestamp.MultipleRunningTimestampServiceError; +import com.palantir.timestamp.TimestampBoundStore; import org.jooq.DSLContext; import org.jooq.Field; import org.jooq.Record; @@ -26,11 +30,6 @@ import org.jooq.exception.DataAccessException; import org.jooq.impl.DSL; -import com.google.common.base.Function; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.timestamp.MultipleRunningTimestampServiceError; -import com.palantir.timestamp.TimestampBoundStore; - public class JdbcTimestampBoundStore implements TimestampBoundStore { private final JdbcKeyValueService kvs; private long latestTimestamp; diff --git a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/MultiTimestampPutBatch.java b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/MultiTimestampPutBatch.java index c38edd23821..07faa320cfb 100644 --- a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/MultiTimestampPutBatch.java +++ b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/MultiTimestampPutBatch.java @@ -15,27 +15,24 @@ */ package com.palantir.atlasdb.keyvalue.jdbc.impl; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Collections2; +import com.google.common.collect.Maps; +import com.google.common.collect.Multimap; +import com.palantir.atlasdb.keyvalue.api.Cell; +import com.palantir.atlasdb.keyvalue.api.Value; import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Map.Entry; - import javax.annotation.Nullable; - import org.jooq.InsertValuesStep4; import org.jooq.Record; import org.jooq.Result; import org.jooq.Row3; import org.jooq.impl.DSL; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.Collections2; -import com.google.common.collect.Maps; -import com.google.common.collect.Multimap; -import com.palantir.atlasdb.keyvalue.api.Cell; -import com.palantir.atlasdb.keyvalue.api.Value; - public class MultiTimestampPutBatch implements PutBatch { private final Multimap data; diff --git a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/PutBatch.java b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/PutBatch.java index 295bbec295c..8a07f27707e 100644 --- a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/PutBatch.java +++ b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/PutBatch.java @@ -16,9 +16,7 @@ package com.palantir.atlasdb.keyvalue.jdbc.impl; import java.util.Collection; - import javax.annotation.Nullable; - import org.jooq.InsertValuesStep4; import org.jooq.Record; import org.jooq.Result; diff --git a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/SingleTimestampPutBatch.java b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/SingleTimestampPutBatch.java index 0ff1e6fbca1..1eb13df96de 100644 --- a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/SingleTimestampPutBatch.java +++ b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/SingleTimestampPutBatch.java @@ -15,25 +15,22 @@ */ package com.palantir.atlasdb.keyvalue.jdbc.impl; +import com.google.common.collect.Collections2; +import com.google.common.collect.Maps; +import com.palantir.atlasdb.keyvalue.api.Cell; +import com.palantir.common.collect.Maps2; import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Map.Entry; - import javax.annotation.Nullable; - import org.jooq.InsertValuesStep4; import org.jooq.Record; import org.jooq.Result; import org.jooq.Row3; import org.jooq.impl.DSL; -import com.google.common.collect.Collections2; -import com.google.common.collect.Maps; -import com.palantir.atlasdb.keyvalue.api.Cell; -import com.palantir.common.collect.Maps2; - public class SingleTimestampPutBatch implements PutBatch { private final Map data; private final Long timestamp; diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/AsyncLockClient.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/AsyncLockClient.java index f9817125b0d..a4a0d503b6e 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/AsyncLockClient.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/AsyncLockClient.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.http; -import java.util.List; -import java.util.Set; - import com.codahale.metrics.MetricRegistry; import com.google.common.collect.ImmutableSet; import com.palantir.lock.StringLockDescriptor; @@ -28,6 +25,8 @@ import com.palantir.lock.v2.TimelockRpcClient; import com.palantir.lock.v2.TimelockService; import com.palantir.logsafe.Preconditions; +import java.util.List; +import java.util.Set; public final class AsyncLockClient implements JepsenLockClient { private final TimelockService timelockService; diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/JepsenLockClient.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/JepsenLockClient.java index 222a85b7dbb..0c8fe194871 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/JepsenLockClient.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/JepsenLockClient.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.http; -import java.util.Set; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; +import java.util.Set; public interface JepsenLockClient { TOKEN lock(String client, String lockName) throws InterruptedException; diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/SynchronousLockClient.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/SynchronousLockClient.java index 7a1e442021b..5d6197f1c78 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/SynchronousLockClient.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/SynchronousLockClient.java @@ -15,9 +15,6 @@ */ package com.palantir.atlasdb.http; -import java.util.List; -import java.util.Set; - import com.codahale.metrics.MetricRegistry; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSortedMap; @@ -28,6 +25,8 @@ import com.palantir.lock.LockRequest; import com.palantir.lock.LockService; import com.palantir.lock.StringLockDescriptor; +import java.util.List; +import java.util.Set; public class SynchronousLockClient implements JepsenLockClient { private final LockService lockService; diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/TimelockUtils.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/TimelockUtils.java index 69f8a1d4f2a..dae38dca22d 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/TimelockUtils.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/TimelockUtils.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.http; -import java.util.List; -import java.util.Optional; - import com.codahale.metrics.MetricRegistry; import com.google.common.collect.Lists; +import java.util.List; +import java.util.Optional; public final class TimelockUtils { private static final int PORT = 8080; diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/TimestampClient.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/TimestampClient.java index f4ee1bb8c32..a4976aff30a 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/TimestampClient.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/TimestampClient.java @@ -15,10 +15,9 @@ */ package com.palantir.atlasdb.http; -import java.util.List; - import com.codahale.metrics.MetricRegistry; import com.palantir.timestamp.TimestampService; +import java.util.List; public final class TimestampClient { private TimestampClient() { diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/CheckerResult.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/CheckerResult.java index 39766cfb97f..bcc57190bbe 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/CheckerResult.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/CheckerResult.java @@ -15,14 +15,12 @@ */ package com.palantir.atlasdb.jepsen; -import java.util.List; -import java.util.stream.Collectors; - -import org.immutables.value.Value; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palantir.atlasdb.jepsen.events.Event; +import java.util.List; +import java.util.stream.Collectors; +import org.immutables.value.Value; @JsonSerialize(as = ImmutableCheckerResult.class) @JsonDeserialize(as = ImmutableCheckerResult.class) diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/JepsenHistoryChecker.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/JepsenHistoryChecker.java index ac3d12e8d48..bc3f7520d8e 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/JepsenHistoryChecker.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/JepsenHistoryChecker.java @@ -15,16 +15,14 @@ */ package com.palantir.atlasdb.jepsen; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - +import clojure.lang.Keyword; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.palantir.atlasdb.jepsen.events.Checker; import com.palantir.atlasdb.jepsen.events.Event; - -import clojure.lang.Keyword; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; public class JepsenHistoryChecker { @@ -87,5 +85,3 @@ private static List> convertEventListToClojureHistory(List< } } - - diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckers.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckers.java index 72f39121c76..0c17954a75d 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckers.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckers.java @@ -15,10 +15,6 @@ */ package com.palantir.atlasdb.jepsen; -import java.util.List; -import java.util.function.Supplier; -import java.util.stream.Collectors; - import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.jepsen.events.Checker; @@ -28,6 +24,9 @@ import com.palantir.atlasdb.jepsen.timestamp.MonotonicChecker; import com.palantir.atlasdb.jepsen.timestamp.NonOverlappingReadsMonotonicChecker; import com.palantir.atlasdb.jepsen.timestamp.UniquenessChecker; +import java.util.List; +import java.util.function.Supplier; +import java.util.stream.Collectors; public final class JepsenHistoryCheckers { diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/NemesisResilienceChecker.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/NemesisResilienceChecker.java index 06375784f9e..3ca92af842c 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/NemesisResilienceChecker.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/NemesisResilienceChecker.java @@ -15,10 +15,6 @@ */ package com.palantir.atlasdb.jepsen; -import java.util.List; -import java.util.Objects; -import java.util.Set; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -28,6 +24,9 @@ import com.palantir.atlasdb.jepsen.events.InfoEvent; import com.palantir.atlasdb.jepsen.events.InvokeEvent; import com.palantir.atlasdb.jepsen.events.OkEvent; +import java.util.List; +import java.util.Objects; +import java.util.Set; public class NemesisResilienceChecker implements Checker { @Override diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/PartitionByInvokeNameCheckerHelper.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/PartitionByInvokeNameCheckerHelper.java index 6cdd5c75ac5..56cd562b0f4 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/PartitionByInvokeNameCheckerHelper.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/PartitionByInvokeNameCheckerHelper.java @@ -15,6 +15,10 @@ */ package com.palantir.atlasdb.jepsen; +import com.palantir.atlasdb.jepsen.events.Checker; +import com.palantir.atlasdb.jepsen.events.Event; +import com.palantir.atlasdb.jepsen.events.InfoEvent; +import com.palantir.atlasdb.jepsen.events.InvokeEvent; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -23,11 +27,6 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import com.palantir.atlasdb.jepsen.events.Checker; -import com.palantir.atlasdb.jepsen.events.Event; -import com.palantir.atlasdb.jepsen.events.InfoEvent; -import com.palantir.atlasdb.jepsen.events.InvokeEvent; - public class PartitionByInvokeNameCheckerHelper implements Checker { private final Supplier checkerSupplier; diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/Checker.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/Checker.java index d6c6e988799..5a76fa5285c 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/Checker.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/Checker.java @@ -15,9 +15,8 @@ */ package com.palantir.atlasdb.jepsen.events; -import java.util.List; - import com.palantir.atlasdb.jepsen.CheckerResult; +import java.util.List; public interface Checker { CheckerResult check(List events); diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/Event.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/Event.java index baef6d89999..bb48e7e3779 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/Event.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/Event.java @@ -15,10 +15,7 @@ */ package com.palantir.atlasdb.jepsen.events; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; - +import clojure.lang.Keyword; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.core.type.TypeReference; @@ -26,8 +23,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.palantir.atlasdb.jepsen.utils.EventUtils; - -import clojure.lang.Keyword; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; import one.util.streamex.EntryStream; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/FailEvent.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/FailEvent.java index bac63b276fd..29faf58d919 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/FailEvent.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/FailEvent.java @@ -15,12 +15,11 @@ */ package com.palantir.atlasdb.jepsen.events; -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.immutables.value.Value; @JsonSerialize(as = ImmutableFailEvent.class) @JsonDeserialize(as = ImmutableFailEvent.class) diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/InfoEvent.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/InfoEvent.java index abef5efbec1..62c95997c68 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/InfoEvent.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/InfoEvent.java @@ -15,15 +15,13 @@ */ package com.palantir.atlasdb.jepsen.events; -import java.util.Optional; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import java.util.Optional; +import org.immutables.value.Value; @JsonSerialize(as = ImmutableInfoEvent.class) @JsonDeserialize(as = ImmutableInfoEvent.class) diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/InvokeEvent.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/InvokeEvent.java index 966a7718b86..51f1e17bf4a 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/InvokeEvent.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/InvokeEvent.java @@ -15,15 +15,13 @@ */ package com.palantir.atlasdb.jepsen.events; -import javax.annotation.Nullable; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import javax.annotation.Nullable; +import org.immutables.value.Value; @JsonSerialize(as = ImmutableInvokeEvent.class) @JsonDeserialize(as = ImmutableInvokeEvent.class) diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/OkEvent.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/OkEvent.java index fc40cd56c4e..57a4b374995 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/OkEvent.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/OkEvent.java @@ -15,15 +15,13 @@ */ package com.palantir.atlasdb.jepsen.events; -import javax.annotation.Nullable; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import javax.annotation.Nullable; +import org.immutables.value.Value; @JsonSerialize(as = ImmutableOkEvent.class) @JsonDeserialize(as = ImmutableOkEvent.class) diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/IsolatedProcessCorrectnessChecker.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/IsolatedProcessCorrectnessChecker.java index 8018a976d50..e68eed1e465 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/IsolatedProcessCorrectnessChecker.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/IsolatedProcessCorrectnessChecker.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.jepsen.lock; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.jepsen.CheckerResult; import com.palantir.atlasdb.jepsen.ImmutableCheckerResult; @@ -33,6 +26,12 @@ import com.palantir.atlasdb.jepsen.events.RequestType; import com.palantir.atlasdb.jepsen.utils.EventUtils; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * This checker verifies that the sequence of events is correct for each process in isolation. Since we know that no diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/LockCorrectnessChecker.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/LockCorrectnessChecker.java index 95b5a15436c..5d51e747d64 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/LockCorrectnessChecker.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/LockCorrectnessChecker.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.jepsen.lock; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Range; import com.google.common.collect.TreeRangeSet; @@ -37,6 +29,12 @@ import com.palantir.atlasdb.jepsen.utils.EventUtils; import com.palantir.logsafe.exceptions.SafeIllegalStateException; import com.palantir.util.Pair; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Checker verifying that whenever a lock is granted, there was a time point between the request and the diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/RefreshCorrectnessChecker.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/RefreshCorrectnessChecker.java index ce0f2055abc..0ff75bb9a7f 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/RefreshCorrectnessChecker.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/RefreshCorrectnessChecker.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.jepsen.lock; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Range; import com.google.common.collect.TreeRangeSet; @@ -36,6 +28,12 @@ import com.palantir.atlasdb.jepsen.events.RequestType; import com.palantir.atlasdb.jepsen.utils.EventUtils; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This checker verifies that refreshes of locks do not cause two processes to simultaneously hold the same lock. diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/MonotonicChecker.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/MonotonicChecker.java index 697489b7ed3..e83c80a8948 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/MonotonicChecker.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/MonotonicChecker.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.jepsen.timestamp; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.jepsen.CheckerResult; import com.palantir.atlasdb.jepsen.ImmutableCheckerResult; @@ -27,6 +22,10 @@ import com.palantir.atlasdb.jepsen.events.Event; import com.palantir.atlasdb.jepsen.events.EventVisitor; import com.palantir.atlasdb.jepsen.events.OkEvent; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class MonotonicChecker implements Checker { @Override diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/NonOverlappingReadsMonotonicChecker.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/NonOverlappingReadsMonotonicChecker.java index 5eae4751ba7..b38325b159b 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/NonOverlappingReadsMonotonicChecker.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/NonOverlappingReadsMonotonicChecker.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.jepsen.timestamp; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.NavigableSet; -import java.util.TreeSet; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.jepsen.CheckerResult; import com.palantir.atlasdb.jepsen.ImmutableCheckerResult; @@ -34,6 +26,13 @@ import com.palantir.atlasdb.jepsen.events.InvokeEvent; import com.palantir.atlasdb.jepsen.events.OkEvent; import com.palantir.atlasdb.jepsen.events.RequestType; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.NavigableSet; +import java.util.TreeSet; public class NonOverlappingReadsMonotonicChecker implements Checker { @Override diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/UniquenessChecker.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/UniquenessChecker.java index 0f3a4b9b0a5..0ad114cf181 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/UniquenessChecker.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/UniquenessChecker.java @@ -15,11 +15,6 @@ */ package com.palantir.atlasdb.jepsen.timestamp; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.jepsen.CheckerResult; import com.palantir.atlasdb.jepsen.ImmutableCheckerResult; @@ -28,6 +23,10 @@ import com.palantir.atlasdb.jepsen.events.EventVisitor; import com.palantir.atlasdb.jepsen.events.FailEvent; import com.palantir.atlasdb.jepsen.events.OkEvent; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class UniquenessChecker implements Checker { @Override diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/utils/EventUtils.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/utils/EventUtils.java index a409ba095cd..de72ed2a54a 100644 --- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/utils/EventUtils.java +++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/utils/EventUtils.java @@ -15,14 +15,12 @@ */ package com.palantir.atlasdb.jepsen.utils; -import java.util.HashMap; -import java.util.Map; - +import clojure.lang.Keyword; import com.palantir.atlasdb.jepsen.JepsenConstants; import com.palantir.atlasdb.jepsen.events.OkEvent; import com.palantir.atlasdb.jepsen.events.RequestType; - -import clojure.lang.Keyword; +import java.util.HashMap; +import java.util.Map; public final class EventUtils { private EventUtils() { diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/http/JepsenLockClientTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/http/JepsenLockClientTest.java index 4784cbfc2e9..f607abe9487 100644 --- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/http/JepsenLockClientTest.java +++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/http/JepsenLockClientTest.java @@ -27,13 +27,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import com.google.common.collect.ImmutableSet; import java.util.Set; - import org.junit.Test; import org.mockito.stubbing.Answer; -import com.google.common.collect.ImmutableSet; - public class JepsenLockClientTest { private static final String LOCK_TOKEN = "foo"; diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/http/SynchronousLockClientTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/http/SynchronousLockClientTest.java index 42b4e0dff31..5a155ad7b47 100644 --- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/http/SynchronousLockClientTest.java +++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/http/SynchronousLockClientTest.java @@ -29,17 +29,15 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.math.BigInteger; -import java.util.Collections; - -import org.junit.Test; - import com.google.common.collect.ImmutableSet; import com.palantir.lock.BlockingMode; import com.palantir.lock.LockMode; import com.palantir.lock.LockRefreshToken; import com.palantir.lock.LockRequest; import com.palantir.lock.LockService; +import java.math.BigInteger; +import java.util.Collections; +import org.junit.Test; public class SynchronousLockClientTest { private static final LockService LOCK_SERVICE = mock(LockService.class); diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckerIntegrationTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckerIntegrationTest.java index 163740b472c..b930ea8cdbb 100644 --- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckerIntegrationTest.java +++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckerIntegrationTest.java @@ -17,24 +17,21 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Supplier; -import java.util.stream.Collectors; - -import org.junit.Test; - +import clojure.lang.Keyword; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.io.Resources; import com.palantir.atlasdb.jepsen.events.Checker; - -import clojure.lang.Keyword; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Supplier; +import java.util.stream.Collectors; import one.util.streamex.EntryStream; +import org.junit.Test; public class JepsenHistoryCheckerIntegrationTest { @Test diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckerTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckerTest.java index 0077580e6ca..a18da6db8c7 100644 --- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckerTest.java +++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckerTest.java @@ -21,18 +21,15 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import org.junit.Test; - +import clojure.lang.Keyword; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.palantir.atlasdb.jepsen.events.Checker; import com.palantir.atlasdb.jepsen.events.Event; - -import clojure.lang.Keyword; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import org.junit.Test; public class JepsenHistoryCheckerTest { private static final Map INFO_EVENT = ImmutableMap.of( diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckersTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckersTest.java index 51f00996639..b9685ec3f20 100644 --- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckersTest.java +++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckersTest.java @@ -18,14 +18,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; +import com.google.common.collect.ImmutableList; +import com.palantir.atlasdb.jepsen.events.Checker; import java.util.List; import java.util.function.Supplier; - import org.junit.Test; -import com.google.common.collect.ImmutableList; -import com.palantir.atlasdb.jepsen.events.Checker; - public class JepsenHistoryCheckersTest { @Test public void canCreateWithTimestampCheckers() { diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/NemesisResilienceCheckerTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/NemesisResilienceCheckerTest.java index 4b213dc7488..638b9b83ff3 100644 --- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/NemesisResilienceCheckerTest.java +++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/NemesisResilienceCheckerTest.java @@ -17,12 +17,11 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.jepsen.events.Event; import com.palantir.atlasdb.jepsen.utils.CheckerTestUtils; import com.palantir.atlasdb.jepsen.utils.TestEventUtils; +import org.junit.Test; public class NemesisResilienceCheckerTest { private static final long ZERO_TIME = 0L; diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/PartitionByInvokeNameCheckerHelperTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/PartitionByInvokeNameCheckerHelperTest.java index d6d83d76c32..e5a40dd381d 100644 --- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/PartitionByInvokeNameCheckerHelperTest.java +++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/PartitionByInvokeNameCheckerHelperTest.java @@ -17,14 +17,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.util.ArrayList; -import java.util.List; -import java.util.function.Supplier; - -import org.junit.Test; -import org.mockito.Matchers; -import org.mockito.Mockito; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.jepsen.events.Checker; import com.palantir.atlasdb.jepsen.events.Event; @@ -34,6 +26,12 @@ import com.palantir.atlasdb.jepsen.events.RequestType; import com.palantir.atlasdb.jepsen.utils.CheckerTestUtils; import com.palantir.atlasdb.jepsen.utils.TestEventUtils; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Supplier; +import org.junit.Test; +import org.mockito.Matchers; +import org.mockito.Mockito; public class PartitionByInvokeNameCheckerHelperTest { diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/events/EventTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/events/EventTest.java index e29fef6747d..75390918317 100644 --- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/events/EventTest.java +++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/events/EventTest.java @@ -17,16 +17,13 @@ import static org.assertj.core.api.Assertions.assertThat; +import clojure.lang.Keyword; +import com.google.common.collect.ImmutableMap; +import com.palantir.atlasdb.jepsen.JepsenConstants; import java.util.HashMap; import java.util.Map; - import org.junit.Test; -import com.google.common.collect.ImmutableMap; -import com.palantir.atlasdb.jepsen.JepsenConstants; - -import clojure.lang.Keyword; - public class EventTest { public static final String SOME_LONG_AS_STRING = "136"; public static final String SOME_STRING = "SOME_STRING"; diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/IsolatedProcessCorrectnessCheckerTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/IsolatedProcessCorrectnessCheckerTest.java index 1134f3395c5..2667997dcaf 100644 --- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/IsolatedProcessCorrectnessCheckerTest.java +++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/IsolatedProcessCorrectnessCheckerTest.java @@ -17,10 +17,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.util.List; - -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.jepsen.CheckerResult; import com.palantir.atlasdb.jepsen.PartitionByInvokeNameCheckerHelper; @@ -28,6 +24,8 @@ import com.palantir.atlasdb.jepsen.events.Event; import com.palantir.atlasdb.jepsen.utils.CheckerTestUtils; import com.palantir.atlasdb.jepsen.utils.TestEventUtils; +import java.util.List; +import org.junit.Test; public class IsolatedProcessCorrectnessCheckerTest { private static final int PROCESS_1 = 1; diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/LockCorrectnessCheckerTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/LockCorrectnessCheckerTest.java index b6e4120e991..fcb8f8412fc 100644 --- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/LockCorrectnessCheckerTest.java +++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/LockCorrectnessCheckerTest.java @@ -17,10 +17,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.util.List; - -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.jepsen.CheckerResult; import com.palantir.atlasdb.jepsen.PartitionByInvokeNameCheckerHelper; @@ -28,6 +24,8 @@ import com.palantir.atlasdb.jepsen.events.Event; import com.palantir.atlasdb.jepsen.utils.CheckerTestUtils; import com.palantir.atlasdb.jepsen.utils.TestEventUtils; +import java.util.List; +import org.junit.Test; public class LockCorrectnessCheckerTest { private static final int PROCESS_1 = 1; diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/RefreshCorrectnessCheckerTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/RefreshCorrectnessCheckerTest.java index 3c1536c30bf..35682aa2064 100644 --- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/RefreshCorrectnessCheckerTest.java +++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/RefreshCorrectnessCheckerTest.java @@ -17,10 +17,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.util.List; - -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.jepsen.CheckerResult; import com.palantir.atlasdb.jepsen.PartitionByInvokeNameCheckerHelper; @@ -28,6 +24,8 @@ import com.palantir.atlasdb.jepsen.events.Event; import com.palantir.atlasdb.jepsen.utils.CheckerTestUtils; import com.palantir.atlasdb.jepsen.utils.TestEventUtils; +import java.util.List; +import org.junit.Test; public class RefreshCorrectnessCheckerTest { private static final int PROCESS_1 = 1; diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/MonotonicCheckerTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/MonotonicCheckerTest.java index c693029f3dd..08880bc3107 100644 --- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/MonotonicCheckerTest.java +++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/MonotonicCheckerTest.java @@ -18,13 +18,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.jepsen.CheckerResult; import com.palantir.atlasdb.jepsen.events.Event; import com.palantir.atlasdb.jepsen.utils.CheckerTestUtils; import com.palantir.atlasdb.jepsen.utils.TestEventUtils; +import org.junit.Test; public class MonotonicCheckerTest { private static final Long ZERO_TIME = 0L; diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/NonOverlappingReadsMonotonicCheckerTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/NonOverlappingReadsMonotonicCheckerTest.java index 857f3c022ce..2bc77e4b5c7 100644 --- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/NonOverlappingReadsMonotonicCheckerTest.java +++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/NonOverlappingReadsMonotonicCheckerTest.java @@ -18,13 +18,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.jepsen.CheckerResult; import com.palantir.atlasdb.jepsen.events.Event; import com.palantir.atlasdb.jepsen.utils.CheckerTestUtils; import com.palantir.atlasdb.jepsen.utils.TestEventUtils; +import org.junit.Test; public class NonOverlappingReadsMonotonicCheckerTest { private static final int PROCESS_0 = 0; diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/UniquenessCheckerTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/UniquenessCheckerTest.java index 50b18c91db0..7fa0bebb79f 100644 --- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/UniquenessCheckerTest.java +++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/UniquenessCheckerTest.java @@ -17,13 +17,12 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.jepsen.CheckerResult; import com.palantir.atlasdb.jepsen.events.Event; import com.palantir.atlasdb.jepsen.utils.CheckerTestUtils; import com.palantir.atlasdb.jepsen.utils.TestEventUtils; +import org.junit.Test; public class UniquenessCheckerTest { private static final long ZERO_TIME = 0L; diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/utils/CheckerTestUtils.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/utils/CheckerTestUtils.java index af0e3f83fbb..66e7646cccd 100644 --- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/utils/CheckerTestUtils.java +++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/utils/CheckerTestUtils.java @@ -17,13 +17,12 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.util.List; -import java.util.function.Supplier; - import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.jepsen.CheckerResult; import com.palantir.atlasdb.jepsen.events.Checker; import com.palantir.atlasdb.jepsen.events.Event; +import java.util.List; +import java.util.function.Supplier; public final class CheckerTestUtils { private CheckerTestUtils() { diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/MinimalReportFormatForTest.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/MinimalReportFormatForTest.java index d44cd14e121..8b77de6cbb2 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/MinimalReportFormatForTest.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/MinimalReportFormatForTest.java @@ -18,7 +18,6 @@ import java.io.IOException; import java.io.PrintStream; import java.util.Collection; - import org.openjdk.jmh.infra.BenchmarkParams; import org.openjdk.jmh.infra.IterationParams; import org.openjdk.jmh.results.BenchmarkResult; diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/PerformanceResults.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/PerformanceResults.java index c9ba9675de9..eabe60011f5 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/PerformanceResults.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/PerformanceResults.java @@ -15,6 +15,12 @@ */ package com.palantir.atlasdb.performance; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.Lists; +import com.palantir.atlasdb.performance.backend.DockerizedDatabaseUri; import java.io.BufferedWriter; import java.io.File; import java.io.FileNotFoundException; @@ -28,7 +34,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; - import org.immutables.value.Value; import org.openjdk.jmh.infra.BenchmarkParams; import org.openjdk.jmh.results.RunResult; @@ -36,13 +41,6 @@ import org.openjdk.jmh.util.Statistics; import org.openjdk.jmh.util.TreeMultiset; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.Lists; -import com.palantir.atlasdb.performance.backend.DockerizedDatabaseUri; - public class PerformanceResults { @VisibleForTesting static final String KVS_AGNOSTIC_SUFFIX = "N/A"; diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/AtlasDbServicesConnector.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/AtlasDbServicesConnector.java index dac9d59f9e9..b7f09c7b8a2 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/AtlasDbServicesConnector.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/AtlasDbServicesConnector.java @@ -15,12 +15,6 @@ */ package com.palantir.atlasdb.performance.backend; -import java.io.Closeable; - -import org.openjdk.jmh.annotations.Param; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.State; - import com.palantir.atlasdb.config.ImmutableAtlasDbConfig; import com.palantir.atlasdb.config.ImmutableAtlasDbRuntimeConfig; import com.palantir.atlasdb.services.AtlasDbServices; @@ -28,6 +22,10 @@ import com.palantir.atlasdb.services.ServicesConfigModule; import com.palantir.atlasdb.spi.KeyValueServiceConfig; import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import java.io.Closeable; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; @State(Scope.Benchmark) public class AtlasDbServicesConnector implements Closeable { diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/CassandraKeyValueServiceInstrumentation.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/CassandraKeyValueServiceInstrumentation.java index 3750abede6b..8d0b1e740fa 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/CassandraKeyValueServiceInstrumentation.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/CassandraKeyValueServiceInstrumentation.java @@ -15,14 +15,13 @@ */ package com.palantir.atlasdb.performance.backend; -import java.net.InetSocketAddress; - import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; import com.palantir.atlasdb.cassandra.ImmutableCassandraCredentialsConfig; import com.palantir.atlasdb.cassandra.ImmutableCassandraKeyValueServiceConfig; import com.palantir.atlasdb.cassandra.ImmutableDefaultConfig; import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceImpl; import com.palantir.atlasdb.spi.KeyValueServiceConfig; +import java.net.InetSocketAddress; public class CassandraKeyValueServiceInstrumentation extends KeyValueServiceInstrumentation { diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/DatabasesContainer.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/DatabasesContainer.java index 26d18108b99..834a4e47405 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/DatabasesContainer.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/DatabasesContainer.java @@ -15,13 +15,11 @@ */ package com.palantir.atlasdb.performance.backend; +import com.google.common.collect.Lists; import java.util.List; - import org.awaitility.Awaitility; import org.awaitility.Duration; -import com.google.common.collect.Lists; - public final class DatabasesContainer implements AutoCloseable { public static DatabasesContainer startup(List backends) { diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/DockerizedDatabase.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/DockerizedDatabase.java index ace99276831..8b5fba603d7 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/DockerizedDatabase.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/DockerizedDatabase.java @@ -15,24 +15,22 @@ */ package com.palantir.atlasdb.performance.backend; +import com.palantir.docker.compose.DockerComposeRule; +import com.palantir.docker.compose.configuration.ShutdownStrategy; +import com.palantir.docker.compose.connection.DockerPort; +import com.palantir.docker.compose.connection.waiting.HealthCheck; +import com.palantir.docker.compose.connection.waiting.SuccessOrFailure; +import com.palantir.logsafe.exceptions.SafeIllegalStateException; +import com.palantir.logsafe.exceptions.SafeRuntimeException; import java.io.Closeable; import java.io.File; import java.io.IOException; import java.net.InetSocketAddress; import java.net.URL; - import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import com.palantir.docker.compose.DockerComposeRule; -import com.palantir.docker.compose.configuration.ShutdownStrategy; -import com.palantir.docker.compose.connection.DockerPort; -import com.palantir.docker.compose.connection.waiting.HealthCheck; -import com.palantir.docker.compose.connection.waiting.SuccessOrFailure; -import com.palantir.logsafe.exceptions.SafeIllegalStateException; -import com.palantir.logsafe.exceptions.SafeRuntimeException; - public final class DockerizedDatabase implements Closeable { private static final String DOCKER_LOGS_DIR = "container-logs"; diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/KeyValueServiceInstrumentation.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/KeyValueServiceInstrumentation.java index 3a26b0139c9..939c359d373 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/KeyValueServiceInstrumentation.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/KeyValueServiceInstrumentation.java @@ -15,15 +15,14 @@ */ package com.palantir.atlasdb.performance.backend; +import com.google.common.annotations.VisibleForTesting; +import com.palantir.atlasdb.spi.KeyValueServiceConfig; import java.lang.reflect.Constructor; import java.net.InetSocketAddress; import java.util.Map; import java.util.Set; import java.util.TreeMap; -import com.google.common.annotations.VisibleForTesting; -import com.palantir.atlasdb.spi.KeyValueServiceConfig; - public abstract class KeyValueServiceInstrumentation { private final int kvsPort; diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/PostgresKeyValueServiceInstrumentation.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/PostgresKeyValueServiceInstrumentation.java index a134a516267..710f4e29726 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/PostgresKeyValueServiceInstrumentation.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/PostgresKeyValueServiceInstrumentation.java @@ -15,13 +15,12 @@ */ package com.palantir.atlasdb.performance.backend; -import java.net.InetSocketAddress; - import com.palantir.atlasdb.keyvalue.dbkvs.ImmutableDbKeyValueServiceConfig; import com.palantir.atlasdb.keyvalue.dbkvs.ImmutablePostgresDdlConfig; import com.palantir.atlasdb.spi.KeyValueServiceConfig; import com.palantir.nexus.db.pool.config.ImmutableMaskedValue; import com.palantir.nexus.db.pool.config.ImmutablePostgresConnectionConfig; +import java.net.InetSocketAddress; public class PostgresKeyValueServiceInstrumentation extends KeyValueServiceInstrumentation { diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/HttpBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/HttpBenchmarks.java index dbff033dfb2..854a97b0ff9 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/HttpBenchmarks.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/HttpBenchmarks.java @@ -15,12 +15,14 @@ */ package com.palantir.atlasdb.performance.benchmarks; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.net.HttpHeaders; +import com.palantir.common.remoting.HeaderAccessUtils; import java.util.Collection; import java.util.Map; import java.util.concurrent.TimeUnit; - import javax.ws.rs.core.MediaType; - import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Measurement; import org.openjdk.jmh.annotations.Scope; @@ -29,11 +31,6 @@ import org.openjdk.jmh.annotations.Warmup; import org.openjdk.jmh.infra.Blackhole; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.net.HttpHeaders; -import com.palantir.common.remoting.HeaderAccessUtils; - @State(Scope.Thread) public class HttpBenchmarks { private static final String LOWERCASE_CONTENT_TYPE = HttpHeaders.CONTENT_TYPE.toLowerCase(); diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsDeleteBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsDeleteBenchmarks.java index 668af9bc718..3a50530f85b 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsDeleteBenchmarks.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsDeleteBenchmarks.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.performance.benchmarks; -import java.util.concurrent.TimeUnit; - -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.Measurement; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.Threads; -import org.openjdk.jmh.annotations.Warmup; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Multimap; @@ -32,6 +23,13 @@ import com.palantir.atlasdb.keyvalue.api.TimestampRangeDelete; import com.palantir.atlasdb.performance.benchmarks.table.ConsecutiveNarrowTable; import com.palantir.atlasdb.performance.benchmarks.table.RegeneratingTable; +import java.util.concurrent.TimeUnit; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; @State(Scope.Benchmark) public class KvsDeleteBenchmarks { diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetCandidateCellsForSweepingBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetCandidateCellsForSweepingBenchmarks.java index 38e82d990bf..9b76ac24f17 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetCandidateCellsForSweepingBenchmarks.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetCandidateCellsForSweepingBenchmarks.java @@ -15,16 +15,6 @@ */ package com.palantir.atlasdb.performance.benchmarks; -import java.util.List; -import java.util.concurrent.TimeUnit; - -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.Measurement; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.Threads; -import org.openjdk.jmh.annotations.Warmup; - import com.google.common.base.Preconditions; import com.google.common.collect.Iterators; import com.palantir.atlasdb.encoding.PtBytes; @@ -36,6 +26,14 @@ import com.palantir.atlasdb.performance.benchmarks.table.ConsecutiveNarrowTable; import com.palantir.atlasdb.performance.benchmarks.table.VeryWideRowTable; import com.palantir.common.base.ClosableIterator; +import java.util.List; +import java.util.concurrent.TimeUnit; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; @State(Scope.Benchmark) public class KvsGetCandidateCellsForSweepingBenchmarks { diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetDynamicBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetDynamicBenchmarks.java index 8784f693469..c39c205809d 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetDynamicBenchmarks.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetDynamicBenchmarks.java @@ -15,12 +15,19 @@ */ package com.palantir.atlasdb.performance.benchmarks; +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; +import com.google.common.primitives.Ints; +import com.palantir.atlasdb.keyvalue.api.Cell; +import com.palantir.atlasdb.keyvalue.api.ColumnSelection; +import com.palantir.atlasdb.keyvalue.api.Value; +import com.palantir.atlasdb.performance.benchmarks.table.ModeratelyWideRowTable; +import com.palantir.atlasdb.performance.benchmarks.table.Tables; import java.io.UnsupportedEncodingException; import java.util.Collections; import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; - import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Measurement; import org.openjdk.jmh.annotations.Scope; @@ -28,15 +35,6 @@ import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; -import com.google.common.primitives.Ints; -import com.palantir.atlasdb.keyvalue.api.Cell; -import com.palantir.atlasdb.keyvalue.api.ColumnSelection; -import com.palantir.atlasdb.keyvalue.api.Value; -import com.palantir.atlasdb.performance.benchmarks.table.ModeratelyWideRowTable; -import com.palantir.atlasdb.performance.benchmarks.table.Tables; - /** * Performance benchmarks for KVS get with dynamic columns. * diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRangeBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRangeBenchmarks.java index bb0b405147c..ab870b35972 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRangeBenchmarks.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRangeBenchmarks.java @@ -15,18 +15,6 @@ */ package com.palantir.atlasdb.performance.benchmarks; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.Measurement; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.Threads; -import org.openjdk.jmh.annotations.Warmup; - import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -37,6 +25,16 @@ import com.palantir.atlasdb.performance.benchmarks.table.ConsecutiveNarrowTable; import com.palantir.common.base.ClosableIterator; import com.palantir.util.paging.TokenBackedBasicResultsPage; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; @State(Scope.Benchmark) public class KvsGetRangeBenchmarks { diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRowsBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRowsBenchmarks.java index f0e1dcb5b3b..80a668eda99 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRowsBenchmarks.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRowsBenchmarks.java @@ -15,8 +15,12 @@ */ package com.palantir.atlasdb.performance.benchmarks; +import com.google.common.base.Preconditions; +import com.palantir.atlasdb.keyvalue.api.Cell; +import com.palantir.atlasdb.keyvalue.api.ColumnSelection; +import com.palantir.atlasdb.keyvalue.api.Value; +import com.palantir.atlasdb.performance.benchmarks.table.ConsecutiveNarrowTable; import java.util.Map; - import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Measurement; import org.openjdk.jmh.annotations.Scope; @@ -24,12 +28,6 @@ import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; -import com.google.common.base.Preconditions; -import com.palantir.atlasdb.keyvalue.api.Cell; -import com.palantir.atlasdb.keyvalue.api.ColumnSelection; -import com.palantir.atlasdb.keyvalue.api.Value; -import com.palantir.atlasdb.performance.benchmarks.table.ConsecutiveNarrowTable; - @State(Scope.Benchmark) public class KvsGetRowsBenchmarks { @Benchmark diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRowsColumnRangeBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRowsColumnRangeBenchmarks.java index 60f8ab5fe80..ea87188c4a2 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRowsColumnRangeBenchmarks.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRowsColumnRangeBenchmarks.java @@ -15,6 +15,14 @@ */ package com.palantir.atlasdb.performance.benchmarks; +import com.google.common.base.Preconditions; +import com.palantir.atlasdb.keyvalue.api.Cell; +import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection; +import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator; +import com.palantir.atlasdb.keyvalue.api.Value; +import com.palantir.atlasdb.performance.benchmarks.table.Tables; +import com.palantir.atlasdb.performance.benchmarks.table.VeryWideRowTable; +import com.palantir.atlasdb.performance.benchmarks.table.WideRowsTable; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -22,7 +30,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.IntStream; - import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Measurement; import org.openjdk.jmh.annotations.Scope; @@ -31,15 +38,6 @@ import org.openjdk.jmh.annotations.Warmup; import org.openjdk.jmh.infra.Blackhole; -import com.google.common.base.Preconditions; -import com.palantir.atlasdb.keyvalue.api.Cell; -import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection; -import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator; -import com.palantir.atlasdb.keyvalue.api.Value; -import com.palantir.atlasdb.performance.benchmarks.table.Tables; -import com.palantir.atlasdb.performance.benchmarks.table.VeryWideRowTable; -import com.palantir.atlasdb.performance.benchmarks.table.WideRowsTable; - @State(Scope.Benchmark) public class KvsGetRowsColumnRangeBenchmarks { diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsPutBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsPutBenchmarks.java index b3352efbd44..f523d73c9f0 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsPutBenchmarks.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsPutBenchmarks.java @@ -15,9 +15,14 @@ */ package com.palantir.atlasdb.performance.benchmarks; +import com.google.common.collect.Maps; +import com.palantir.atlasdb.keyvalue.api.Cell; +import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException; +import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.performance.benchmarks.table.EmptyTables; +import com.palantir.logsafe.Preconditions; import java.util.Map; import java.util.concurrent.TimeUnit; - import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Measurement; import org.openjdk.jmh.annotations.Scope; @@ -25,13 +30,6 @@ import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; -import com.google.common.collect.Maps; -import com.palantir.atlasdb.keyvalue.api.Cell; -import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException; -import com.palantir.atlasdb.keyvalue.api.TableReference; -import com.palantir.atlasdb.performance.benchmarks.table.EmptyTables; -import com.palantir.logsafe.Preconditions; - /** * Performance benchmarks for KVS put operations. * diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/StreamStoreBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/StreamStoreBenchmarks.java index 5131f4c3b9d..bbf350110fc 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/StreamStoreBenchmarks.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/StreamStoreBenchmarks.java @@ -20,13 +20,16 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertThat; +import com.palantir.atlasdb.performance.benchmarks.table.StreamingTable; +import com.palantir.atlasdb.performance.schema.generated.StreamTestTableFactory; +import com.palantir.atlasdb.performance.schema.generated.ValueStreamStore; +import com.palantir.atlasdb.transaction.api.TransactionManager; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.util.concurrent.TimeUnit; - import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Measurement; import org.openjdk.jmh.annotations.Scope; @@ -34,11 +37,6 @@ import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; -import com.palantir.atlasdb.performance.benchmarks.table.StreamingTable; -import com.palantir.atlasdb.performance.schema.generated.StreamTestTableFactory; -import com.palantir.atlasdb.performance.schema.generated.ValueStreamStore; -import com.palantir.atlasdb.transaction.api.TransactionManager; - @State(Scope.Benchmark) public class StreamStoreBenchmarks { diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/SweepBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/SweepBenchmarks.java index eaa721fec8a..727f7520583 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/SweepBenchmarks.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/SweepBenchmarks.java @@ -18,8 +18,13 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; +import com.palantir.atlasdb.encoding.PtBytes; +import com.palantir.atlasdb.keyvalue.api.SweepResults; +import com.palantir.atlasdb.performance.benchmarks.table.RegeneratingTable; +import com.palantir.atlasdb.sweep.ImmutableSweepBatchConfig; +import com.palantir.atlasdb.sweep.SweepBatchConfig; +import com.palantir.atlasdb.sweep.SweepTaskRunner; import java.util.concurrent.TimeUnit; - import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Measurement; import org.openjdk.jmh.annotations.Scope; @@ -27,13 +32,6 @@ import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; -import com.palantir.atlasdb.encoding.PtBytes; -import com.palantir.atlasdb.keyvalue.api.SweepResults; -import com.palantir.atlasdb.performance.benchmarks.table.RegeneratingTable; -import com.palantir.atlasdb.sweep.ImmutableSweepBatchConfig; -import com.palantir.atlasdb.sweep.SweepBatchConfig; -import com.palantir.atlasdb.sweep.SweepTaskRunner; - @State(Scope.Benchmark) public class SweepBenchmarks { diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TimestampServiceBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TimestampServiceBenchmarks.java index 11c52d444a0..79d2eecb959 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TimestampServiceBenchmarks.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TimestampServiceBenchmarks.java @@ -15,17 +15,15 @@ */ package com.palantir.atlasdb.performance.benchmarks; +import com.palantir.atlasdb.performance.benchmarks.endpoint.TimestampServiceEndpoint; +import com.palantir.timestamp.TimestampRange; import java.util.concurrent.TimeUnit; - import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Measurement; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; import org.openjdk.jmh.infra.Blackhole; -import com.palantir.atlasdb.performance.benchmarks.endpoint.TimestampServiceEndpoint; -import com.palantir.timestamp.TimestampRange; - public class TimestampServiceBenchmarks { @Benchmark @Warmup(time = 1, timeUnit = TimeUnit.SECONDS) diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionDeleteBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionDeleteBenchmarks.java index b3fbc37a7bb..56d75226b64 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionDeleteBenchmarks.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionDeleteBenchmarks.java @@ -15,9 +15,10 @@ */ package com.palantir.atlasdb.performance.benchmarks; +import com.palantir.atlasdb.keyvalue.api.Cell; +import com.palantir.atlasdb.performance.benchmarks.table.RegeneratingTable; import java.util.Set; import java.util.concurrent.TimeUnit; - import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Measurement; import org.openjdk.jmh.annotations.Scope; @@ -25,9 +26,6 @@ import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; -import com.palantir.atlasdb.keyvalue.api.Cell; -import com.palantir.atlasdb.performance.benchmarks.table.RegeneratingTable; - @State(Scope.Benchmark) public class TransactionDeleteBenchmarks { diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetBenchmarks.java index 624e7bc7b5a..78f564798df 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetBenchmarks.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetBenchmarks.java @@ -15,11 +15,19 @@ */ package com.palantir.atlasdb.performance.benchmarks; +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; +import com.google.common.primitives.Ints; +import com.palantir.atlasdb.keyvalue.api.Cell; +import com.palantir.atlasdb.keyvalue.api.RangeRequest; +import com.palantir.atlasdb.keyvalue.api.RowResult; +import com.palantir.atlasdb.performance.benchmarks.table.ConsecutiveNarrowTable; +import com.palantir.common.base.BatchingVisitable; +import com.palantir.common.base.BatchingVisitables; import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; - import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Measurement; import org.openjdk.jmh.annotations.Scope; @@ -27,16 +35,6 @@ import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; -import com.google.common.primitives.Ints; -import com.palantir.atlasdb.keyvalue.api.Cell; -import com.palantir.atlasdb.keyvalue.api.RangeRequest; -import com.palantir.atlasdb.keyvalue.api.RowResult; -import com.palantir.atlasdb.performance.benchmarks.table.ConsecutiveNarrowTable; -import com.palantir.common.base.BatchingVisitable; -import com.palantir.common.base.BatchingVisitables; - @State(Scope.Benchmark) public class TransactionGetBenchmarks { diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetDynamicBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetDynamicBenchmarks.java index b7f167673d0..51cd2afac9a 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetDynamicBenchmarks.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetDynamicBenchmarks.java @@ -15,12 +15,19 @@ */ package com.palantir.atlasdb.performance.benchmarks; +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; +import com.google.common.primitives.Ints; +import com.palantir.atlasdb.keyvalue.api.Cell; +import com.palantir.atlasdb.keyvalue.api.ColumnSelection; +import com.palantir.atlasdb.keyvalue.api.RowResult; +import com.palantir.atlasdb.performance.benchmarks.table.ModeratelyWideRowTable; +import com.palantir.atlasdb.performance.benchmarks.table.Tables; import java.util.Collections; import java.util.Map; import java.util.SortedMap; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; - import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Measurement; import org.openjdk.jmh.annotations.Scope; @@ -28,15 +35,6 @@ import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; -import com.google.common.primitives.Ints; -import com.palantir.atlasdb.keyvalue.api.Cell; -import com.palantir.atlasdb.keyvalue.api.ColumnSelection; -import com.palantir.atlasdb.keyvalue.api.RowResult; -import com.palantir.atlasdb.performance.benchmarks.table.ModeratelyWideRowTable; -import com.palantir.atlasdb.performance.benchmarks.table.Tables; - /** * Performance benchmarks for KVS get with dynamic columns. * diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetRowsColumnRangeBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetRowsColumnRangeBenchmarks.java index 471900c7e5f..c71433e3dc6 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetRowsColumnRangeBenchmarks.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetRowsColumnRangeBenchmarks.java @@ -15,12 +15,20 @@ */ package com.palantir.atlasdb.performance.benchmarks; +import com.google.common.base.Preconditions; +import com.palantir.atlasdb.keyvalue.api.Cell; +import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection; +import com.palantir.atlasdb.performance.benchmarks.table.CleanModeratelyWideRowTable; +import com.palantir.atlasdb.performance.benchmarks.table.DirtyModeratelyWideRowTable; +import com.palantir.atlasdb.performance.benchmarks.table.ModeratelyWideRowTable; +import com.palantir.atlasdb.performance.benchmarks.table.Tables; +import com.palantir.atlasdb.performance.benchmarks.table.VeryWideRowTable; +import com.palantir.atlasdb.performance.benchmarks.table.WideRowTable; import java.util.Collections; import java.util.Iterator; import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; - import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Measurement; import org.openjdk.jmh.annotations.Scope; @@ -29,16 +37,6 @@ import org.openjdk.jmh.annotations.Warmup; import org.openjdk.jmh.infra.Blackhole; -import com.google.common.base.Preconditions; -import com.palantir.atlasdb.keyvalue.api.Cell; -import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection; -import com.palantir.atlasdb.performance.benchmarks.table.CleanModeratelyWideRowTable; -import com.palantir.atlasdb.performance.benchmarks.table.DirtyModeratelyWideRowTable; -import com.palantir.atlasdb.performance.benchmarks.table.ModeratelyWideRowTable; -import com.palantir.atlasdb.performance.benchmarks.table.Tables; -import com.palantir.atlasdb.performance.benchmarks.table.VeryWideRowTable; -import com.palantir.atlasdb.performance.benchmarks.table.WideRowTable; - @State(Scope.Benchmark) public class TransactionGetRowsColumnRangeBenchmarks { diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionPutBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionPutBenchmarks.java index f0342b1922a..5f9fc470b6a 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionPutBenchmarks.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionPutBenchmarks.java @@ -15,9 +15,10 @@ */ package com.palantir.atlasdb.performance.benchmarks; +import com.palantir.atlasdb.keyvalue.api.Cell; +import com.palantir.atlasdb.performance.benchmarks.table.EmptyTables; import java.util.Map; import java.util.concurrent.TimeUnit; - import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Measurement; import org.openjdk.jmh.annotations.Scope; @@ -25,9 +26,6 @@ import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; -import com.palantir.atlasdb.keyvalue.api.Cell; -import com.palantir.atlasdb.performance.benchmarks.table.EmptyTables; - /** * Performance benchmarks for KVS put operations. * diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/endpoint/TimestampServiceEndpoint.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/endpoint/TimestampServiceEndpoint.java index 9d1f4d174d2..303f1accd3f 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/endpoint/TimestampServiceEndpoint.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/endpoint/TimestampServiceEndpoint.java @@ -15,16 +15,15 @@ */ package com.palantir.atlasdb.performance.benchmarks.endpoint; +import com.palantir.atlasdb.performance.backend.AtlasDbServicesConnector; +import com.palantir.timestamp.TimestampRange; +import com.palantir.timestamp.TimestampService; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.Setup; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.TearDown; -import com.palantir.atlasdb.performance.backend.AtlasDbServicesConnector; -import com.palantir.timestamp.TimestampRange; -import com.palantir.timestamp.TimestampService; - @State(Scope.Benchmark) public class TimestampServiceEndpoint { @@ -50,4 +49,3 @@ public void cleanup() throws Exception { this.connector.close(); } } - diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/AbstractWideRowsTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/AbstractWideRowsTable.java index ca2f3494cc7..5f503be9472 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/AbstractWideRowsTable.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/AbstractWideRowsTable.java @@ -15,16 +15,6 @@ */ package com.palantir.atlasdb.performance.benchmarks.table; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.Map; - -import org.openjdk.jmh.annotations.Level; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.TearDown; - import com.google.common.collect.ImmutableSet; import com.google.common.primitives.Ints; import com.palantir.atlasdb.keyvalue.api.Cell; @@ -34,6 +24,14 @@ import com.palantir.atlasdb.performance.benchmarks.Benchmarks; import com.palantir.atlasdb.services.AtlasDbServices; import com.palantir.atlasdb.transaction.api.TransactionManager; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; @State(Scope.Benchmark) public abstract class AbstractWideRowsTable { diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/CleanModeratelyWideRowTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/CleanModeratelyWideRowTable.java index df933d6a7c2..26c058078af 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/CleanModeratelyWideRowTable.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/CleanModeratelyWideRowTable.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.performance.benchmarks.table; +import com.palantir.atlasdb.keyvalue.api.TableReference; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; -import com.palantir.atlasdb.keyvalue.api.TableReference; - @State(Scope.Benchmark) public class CleanModeratelyWideRowTable extends WideRowTableWithAbortedValues { @Override diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/ConsecutiveNarrowTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/ConsecutiveNarrowTable.java index 4135504773f..2808d4c111b 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/ConsecutiveNarrowTable.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/ConsecutiveNarrowTable.java @@ -15,20 +15,6 @@ */ package com.palantir.atlasdb.performance.benchmarks.table; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - -import org.openjdk.jmh.annotations.Level; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.TearDown; - import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -43,6 +29,18 @@ import com.palantir.atlasdb.performance.benchmarks.Benchmarks; import com.palantir.atlasdb.services.AtlasDbServices; import com.palantir.atlasdb.transaction.api.TransactionManager; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; /** * State class for creating a single Atlas table and adding N rows with row names [0...N). diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/DirtyModeratelyWideRowTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/DirtyModeratelyWideRowTable.java index 084c904815b..88107b3be5c 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/DirtyModeratelyWideRowTable.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/DirtyModeratelyWideRowTable.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.performance.benchmarks.table; +import com.palantir.atlasdb.keyvalue.api.TableReference; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; -import com.palantir.atlasdb.keyvalue.api.TableReference; - @State(Scope.Benchmark) public class DirtyModeratelyWideRowTable extends WideRowTableWithAbortedValues { @Override diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/EmptyTables.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/EmptyTables.java index c205a1721c8..9887e2a2ec1 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/EmptyTables.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/EmptyTables.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.performance.benchmarks.table; -import java.util.Map; -import java.util.Random; - -import org.openjdk.jmh.annotations.Level; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.TearDown; - import com.google.common.collect.Sets; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.KeyValueService; @@ -32,6 +23,13 @@ import com.palantir.atlasdb.performance.benchmarks.Benchmarks; import com.palantir.atlasdb.services.AtlasDbServices; import com.palantir.atlasdb.transaction.api.TransactionManager; +import java.util.Map; +import java.util.Random; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; /** * State class for creating a single Atlas table with one wide row. diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/ModeratelyWideRowTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/ModeratelyWideRowTable.java index cc510258af9..f36f72399b0 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/ModeratelyWideRowTable.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/ModeratelyWideRowTable.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.performance.benchmarks.table; +import com.palantir.atlasdb.keyvalue.api.TableReference; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; -import com.palantir.atlasdb.keyvalue.api.TableReference; - @State(Scope.Benchmark) public class ModeratelyWideRowTable extends WideRowTable { @Override diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/RegeneratingTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/RegeneratingTable.java index 7bb63643331..712abd72597 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/RegeneratingTable.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/RegeneratingTable.java @@ -15,17 +15,6 @@ */ package com.palantir.atlasdb.performance.benchmarks.table; -import java.util.Map; -import java.util.Random; -import java.util.Set; -import java.util.stream.LongStream; - -import org.openjdk.jmh.annotations.Level; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.TearDown; - import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; @@ -41,6 +30,15 @@ import com.palantir.atlasdb.services.AtlasDbServices; import com.palantir.atlasdb.sweep.SweepTaskRunner; import com.palantir.atlasdb.transaction.api.TransactionManager; +import java.util.Map; +import java.util.Random; +import java.util.Set; +import java.util.stream.LongStream; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; /** * State class for creating a single Atlas table with one wide row. diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/StreamingTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/StreamingTable.java index 6d4c75e0f00..c9f3dead318 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/StreamingTable.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/StreamingTable.java @@ -15,17 +15,6 @@ */ package com.palantir.atlasdb.performance.benchmarks.table; -import java.io.ByteArrayInputStream; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.Random; - -import org.openjdk.jmh.annotations.Level; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.TearDown; - import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; import com.palantir.atlasdb.keyvalue.api.KeyValueService; @@ -42,6 +31,15 @@ import com.palantir.atlasdb.table.generation.ColumnValues; import com.palantir.atlasdb.transaction.api.TransactionManager; import com.palantir.common.persist.Persistable; +import java.io.ByteArrayInputStream; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.Random; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; @State(Scope.Benchmark) public class StreamingTable { diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/Tables.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/Tables.java index e873def4dc1..fddc47209c2 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/Tables.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/Tables.java @@ -15,15 +15,14 @@ */ package com.palantir.atlasdb.performance.benchmarks.table; -import java.nio.ByteBuffer; -import java.nio.charset.StandardCharsets; -import java.util.Map; -import java.util.Random; - import com.google.common.collect.Maps; import com.google.common.primitives.Ints; import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.keyvalue.api.TableReference; +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; +import java.util.Map; +import java.util.Random; public final class Tables { diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/VeryWideRowTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/VeryWideRowTable.java index 620eeabe345..eda18d9fefa 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/VeryWideRowTable.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/VeryWideRowTable.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.performance.benchmarks.table; +import com.palantir.atlasdb.keyvalue.api.TableReference; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; -import com.palantir.atlasdb.keyvalue.api.TableReference; - @State(Scope.Benchmark) public class VeryWideRowTable extends WideRowTable { @Override diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowTable.java index 5f93a8a2529..d3eecb042b8 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowTable.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowTable.java @@ -15,14 +15,6 @@ */ package com.palantir.atlasdb.performance.benchmarks.table; -import java.io.UnsupportedEncodingException; -import java.nio.charset.StandardCharsets; -import java.util.Map; -import java.util.Set; - -import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.TearDown; - import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.primitives.Ints; @@ -33,6 +25,12 @@ import com.palantir.atlasdb.performance.benchmarks.Benchmarks; import com.palantir.atlasdb.services.AtlasDbServices; import com.palantir.atlasdb.transaction.api.TransactionManager; +import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; +import java.util.Map; +import java.util.Set; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.TearDown; /** * State class for creating a single Atlas table with one wide row. diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowTableWithAbortedValues.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowTableWithAbortedValues.java index b1b0f1a188a..b5fb17d90bc 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowTableWithAbortedValues.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowTableWithAbortedValues.java @@ -15,13 +15,6 @@ */ package com.palantir.atlasdb.performance.benchmarks.table; -import java.nio.charset.StandardCharsets; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; @@ -29,6 +22,12 @@ import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.ptobject.EncodingUtils; import com.palantir.util.crypto.Sha256Hash; +import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.IntStream; /** * State class for creating a single Atlas table with one wide row. diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowsTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowsTable.java index 9cd285745e7..2685f829622 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowsTable.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowsTable.java @@ -15,15 +15,6 @@ */ package com.palantir.atlasdb.performance.benchmarks.table; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.Map; - -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.TearDown; - import com.google.common.collect.Sets; import com.google.common.primitives.Ints; import com.palantir.atlasdb.keyvalue.api.Cell; @@ -33,6 +24,13 @@ import com.palantir.atlasdb.performance.benchmarks.Benchmarks; import com.palantir.atlasdb.services.AtlasDbServices; import com.palantir.atlasdb.transaction.api.TransactionManager; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; /** * State class for creating a single Atlas table with one wide row. diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/cli/AtlasDbPerfCli.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/cli/AtlasDbPerfCli.java index 530eddd1d3a..4b7088c05ac 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/cli/AtlasDbPerfCli.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/cli/AtlasDbPerfCli.java @@ -15,15 +15,26 @@ */ package com.palantir.atlasdb.performance.cli; +import com.palantir.atlasdb.performance.BenchmarkParam; +import com.palantir.atlasdb.performance.MinimalReportFormatForTest; +import com.palantir.atlasdb.performance.PerformanceResults; +import com.palantir.atlasdb.performance.backend.DatabasesContainer; +import com.palantir.atlasdb.performance.backend.DockerizedDatabase; +import com.palantir.atlasdb.performance.backend.DockerizedDatabaseUri; +import com.palantir.atlasdb.performance.backend.KeyValueServiceInstrumentation; +import com.palantir.logsafe.exceptions.SafeRuntimeException; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.HelpOption; +import io.airlift.airline.Option; +import io.airlift.airline.SingleCommand; import java.io.File; import java.util.Collection; import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; - import javax.inject.Inject; - import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Mode; import org.openjdk.jmh.results.RunResult; @@ -36,21 +47,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.palantir.atlasdb.performance.BenchmarkParam; -import com.palantir.atlasdb.performance.MinimalReportFormatForTest; -import com.palantir.atlasdb.performance.PerformanceResults; -import com.palantir.atlasdb.performance.backend.DatabasesContainer; -import com.palantir.atlasdb.performance.backend.DockerizedDatabase; -import com.palantir.atlasdb.performance.backend.DockerizedDatabaseUri; -import com.palantir.atlasdb.performance.backend.KeyValueServiceInstrumentation; -import com.palantir.logsafe.exceptions.SafeRuntimeException; - -import io.airlift.airline.Arguments; -import io.airlift.airline.Command; -import io.airlift.airline.HelpOption; -import io.airlift.airline.Option; -import io.airlift.airline.SingleCommand; - /** * The Atlas Perf(ormance) CLI is a tool for making and running AtlasDB performance tests. * diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/StreamTestSchema.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/StreamTestSchema.java index 42de8a20bf2..745f9b4bfe6 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/StreamTestSchema.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/StreamTestSchema.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.performance.schema; -import java.io.File; - import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence; import com.palantir.atlasdb.schema.AtlasSchema; @@ -25,6 +23,7 @@ import com.palantir.atlasdb.table.description.Schema; import com.palantir.atlasdb.table.description.TableDefinition; import com.palantir.atlasdb.table.description.ValueType; +import java.io.File; public final class StreamTestSchema implements AtlasSchema { private static final Schema STREAM_TEST_SCHEMA = generateSchema(); diff --git a/atlasdb-perf/src/test/java/com/palantir/atlasdb/performance/PerformanceResultsTest.java b/atlasdb-perf/src/test/java/com/palantir/atlasdb/performance/PerformanceResultsTest.java index 85c0f7dc7c5..183670255e5 100644 --- a/atlasdb-perf/src/test/java/com/palantir/atlasdb/performance/PerformanceResultsTest.java +++ b/atlasdb-perf/src/test/java/com/palantir/atlasdb/performance/PerformanceResultsTest.java @@ -17,8 +17,9 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.google.common.collect.ImmutableList; +import com.palantir.atlasdb.performance.backend.CassandraKeyValueServiceInstrumentation; import java.util.List; - import org.apache.commons.math3.stat.inference.TestUtils; import org.assertj.core.util.Lists; import org.junit.Test; @@ -29,9 +30,6 @@ import org.openjdk.jmh.runner.WorkloadParams; import org.openjdk.jmh.util.MultisetStatistics; -import com.google.common.collect.ImmutableList; -import com.palantir.atlasdb.performance.backend.CassandraKeyValueServiceInstrumentation; - public class PerformanceResultsTest { private static final String SUITE_NAME = "PerformanceResults"; private static final String BENCHMARK_NAME = "doStuff"; diff --git a/atlasdb-perf/src/test/java/com/palantir/atlasdb/performance/backend/MockKeyValueServiceInstrumentation.java b/atlasdb-perf/src/test/java/com/palantir/atlasdb/performance/backend/MockKeyValueServiceInstrumentation.java index 9f7fc17dcb5..a1b20a90482 100644 --- a/atlasdb-perf/src/test/java/com/palantir/atlasdb/performance/backend/MockKeyValueServiceInstrumentation.java +++ b/atlasdb-perf/src/test/java/com/palantir/atlasdb/performance/backend/MockKeyValueServiceInstrumentation.java @@ -15,12 +15,10 @@ */ package com.palantir.atlasdb.performance.backend; +import com.palantir.atlasdb.spi.KeyValueServiceConfig; import java.net.InetSocketAddress; - import org.mockito.Mockito; -import com.palantir.atlasdb.spi.KeyValueServiceConfig; - public class MockKeyValueServiceInstrumentation extends KeyValueServiceInstrumentation { public MockKeyValueServiceInstrumentation() { diff --git a/atlasdb-persistent-lock-api/src/main/java/com/palantir/atlasdb/persistentlock/PersistentLockId.java b/atlasdb-persistent-lock-api/src/main/java/com/palantir/atlasdb/persistentlock/PersistentLockId.java index cb1318d0582..02368d69288 100644 --- a/atlasdb-persistent-lock-api/src/main/java/com/palantir/atlasdb/persistentlock/PersistentLockId.java +++ b/atlasdb-persistent-lock-api/src/main/java/com/palantir/atlasdb/persistentlock/PersistentLockId.java @@ -15,12 +15,10 @@ */ package com.palantir.atlasdb.persistentlock; -import java.util.UUID; - -import org.immutables.value.Value; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.UUID; +import org.immutables.value.Value; @Value.Immutable public interface PersistentLockId { diff --git a/atlasdb-processors-tests/src/test/java/com/palantir/processors/AutoDelegateGenericTests.java b/atlasdb-processors-tests/src/test/java/com/palantir/processors/AutoDelegateGenericTests.java index ecab05e90d2..ea215cbc677 100644 --- a/atlasdb-processors-tests/src/test/java/com/palantir/processors/AutoDelegateGenericTests.java +++ b/atlasdb-processors-tests/src/test/java/com/palantir/processors/AutoDelegateGenericTests.java @@ -19,13 +19,11 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.google.common.collect.Sets; import java.util.Set; - import org.assertj.core.api.Condition; import org.junit.Test; -import com.google.common.collect.Sets; - public class AutoDelegateGenericTests { @Test public void generatedInterfaceHasInterfaceMethods() { diff --git a/atlasdb-processors-tests/src/test/java/com/palantir/processors/AutoDelegateInterfaceTests.java b/atlasdb-processors-tests/src/test/java/com/palantir/processors/AutoDelegateInterfaceTests.java index c17ec66c631..0c83c5d753e 100644 --- a/atlasdb-processors-tests/src/test/java/com/palantir/processors/AutoDelegateInterfaceTests.java +++ b/atlasdb-processors-tests/src/test/java/com/palantir/processors/AutoDelegateInterfaceTests.java @@ -15,21 +15,18 @@ */ package com.palantir.processors; +import static com.palantir.processors.TestingUtils.extractMethodsSatisfyingPredicate; +import static com.palantir.processors.TestingUtils.extractNonStaticMethods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static com.palantir.processors.TestingUtils.extractMethodsSatisfyingPredicate; -import static com.palantir.processors.TestingUtils.extractNonStaticMethods; - +import com.google.common.collect.Sets; import java.lang.reflect.Modifier; import java.util.Set; - import org.junit.Test; -import com.google.common.collect.Sets; - public class AutoDelegateInterfaceTests { @Test diff --git a/atlasdb-processors/src/main/java/com/palantir/processors/AutoDelegateProcessor.java b/atlasdb-processors/src/main/java/com/palantir/processors/AutoDelegateProcessor.java index 1665e270d2c..0d8b575013d 100644 --- a/atlasdb-processors/src/main/java/com/palantir/processors/AutoDelegateProcessor.java +++ b/atlasdb-processors/src/main/java/com/palantir/processors/AutoDelegateProcessor.java @@ -15,6 +15,15 @@ */ package com.palantir.processors; +import com.google.auto.service.AutoService; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.MapMaker; +import com.google.common.collect.Sets; +import com.squareup.javapoet.JavaFile; +import com.squareup.javapoet.MethodSpec; +import com.squareup.javapoet.TypeName; +import com.squareup.javapoet.TypeSpec; +import com.squareup.javapoet.TypeVariableName; import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; @@ -24,7 +33,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; import java.util.stream.Stream; - import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.Filer; import javax.annotation.processing.FilerException; @@ -45,16 +53,6 @@ import javax.lang.model.util.Types; import javax.tools.Diagnostic; -import com.google.auto.service.AutoService; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.MapMaker; -import com.google.common.collect.Sets; -import com.squareup.javapoet.JavaFile; -import com.squareup.javapoet.MethodSpec; -import com.squareup.javapoet.TypeName; -import com.squareup.javapoet.TypeSpec; -import com.squareup.javapoet.TypeVariableName; - @AutoService(Processor.class) public final class AutoDelegateProcessor extends AbstractProcessor { // We keep track of if this processor has been registered in a processing environment, to avoid registering it diff --git a/atlasdb-processors/src/main/java/com/palantir/processors/ProcessorUtils.java b/atlasdb-processors/src/main/java/com/palantir/processors/ProcessorUtils.java index d254eae6311..108979fd27e 100644 --- a/atlasdb-processors/src/main/java/com/palantir/processors/ProcessorUtils.java +++ b/atlasdb-processors/src/main/java/com/palantir/processors/ProcessorUtils.java @@ -15,9 +15,9 @@ */ package com.palantir.processors; +import com.squareup.javapoet.ParameterSpec; import java.util.List; import java.util.stream.Collectors; - import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; import javax.lang.model.type.DeclaredType; @@ -25,8 +25,6 @@ import javax.lang.model.type.TypeMirror; import javax.lang.model.util.Types; -import com.squareup.javapoet.ParameterSpec; - final class ProcessorUtils { private ProcessorUtils() {} diff --git a/atlasdb-processors/src/main/java/com/palantir/processors/TypeToExtend.java b/atlasdb-processors/src/main/java/com/palantir/processors/TypeToExtend.java index dc966208c88..bce0a136886 100644 --- a/atlasdb-processors/src/main/java/com/palantir/processors/TypeToExtend.java +++ b/atlasdb-processors/src/main/java/com/palantir/processors/TypeToExtend.java @@ -15,12 +15,12 @@ */ package com.palantir.processors; +import com.google.common.collect.Sets; import java.util.List; import java.util.Map; import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; - import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.ExecutableElement; @@ -30,8 +30,6 @@ import javax.lang.model.element.TypeParameterElement; import javax.lang.model.type.TypeMirror; -import com.google.common.collect.Sets; - final class TypeToExtend { private final TypeElement typeToExtend; private final PackageElement typePackage; diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/AtlasDbService.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/AtlasDbService.java index 79502c5a4a3..643baf7f16a 100644 --- a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/AtlasDbService.java +++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/AtlasDbService.java @@ -15,8 +15,9 @@ */ package com.palantir.atlasdb.api; +import com.palantir.atlasdb.table.description.TableMetadata; +import com.palantir.common.annotation.Idempotent; import java.util.Set; - import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.POST; @@ -25,9 +26,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import com.palantir.atlasdb.table.description.TableMetadata; -import com.palantir.common.annotation.Idempotent; - @Path("/atlasdb") public interface AtlasDbService { diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/RangeToken.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/RangeToken.java index 0efdbb57c84..9d997914d44 100644 --- a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/RangeToken.java +++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/RangeToken.java @@ -15,9 +15,8 @@ */ package com.palantir.atlasdb.api; -import javax.annotation.Nullable; - import com.palantir.logsafe.Preconditions; +import javax.annotation.Nullable; /* * 

diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableCellVal.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableCellVal.java
index 84a18d50570..4f6052be6b2 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableCellVal.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableCellVal.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.api;
 
-import java.util.Map;
-
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.logsafe.Preconditions;
+import java.util.Map;
 
 /**
  * For tables with named columns,
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRange.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRange.java
index aff88e16d92..c55287e5ca6 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRange.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRange.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.api;
 
-import java.util.Arrays;
-
 import com.palantir.logsafe.Preconditions;
+import java.util.Arrays;
 
 /**
  * 
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRowResult.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRowResult.java
index 92d6a049b00..4dc5f30452b 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRowResult.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRowResult.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.api;
 
-import java.util.Collection;
-
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.logsafe.Preconditions;
+import java.util.Collection;
 
 /**
  * For tables with named columns,
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/impl/AtlasDbServiceImpl.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/impl/AtlasDbServiceImpl.java
index 47c376f3ebd..323d1135038 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/impl/AtlasDbServiceImpl.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/impl/AtlasDbServiceImpl.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.impl;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.ImmutableSet;
@@ -54,6 +44,14 @@
 import com.palantir.common.base.BatchingVisitable;
 import com.palantir.common.base.BatchingVisitables;
 import com.palantir.logsafe.Preconditions;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import javax.inject.Inject;
 
 public class AtlasDbServiceImpl implements AtlasDbService {
     private static final TableMetadata RAW_METADATA = TableMetadata.builder()
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/impl/TableMetadataCache.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/impl/TableMetadataCache.java
index 84364390256..e489244b81d 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/impl/TableMetadataCache.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/impl/TableMetadataCache.java
@@ -15,17 +15,15 @@
  */
 package com.palantir.atlasdb.impl;
 
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.CheckForNull;
-import javax.inject.Inject;
-
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.CheckForNull;
+import javax.inject.Inject;
 
 public class TableMetadataCache {
     private final LoadingCache cache;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasDeserializers.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasDeserializers.java
index 7608818a63e..bed1014e1c0 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasDeserializers.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasDeserializers.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
@@ -49,6 +43,11 @@
 import com.palantir.atlasdb.table.description.NamedColumnDescription;
 import com.palantir.atlasdb.table.description.TableMetadata;
 import com.palantir.common.base.Throwables;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 public final class AtlasDeserializers {
 
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasJacksonModule.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasJacksonModule.java
index 9d164a59c28..0e807606095 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasJacksonModule.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasJacksonModule.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import javax.inject.Inject;
-
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.palantir.atlasdb.api.RangeToken;
@@ -27,6 +25,7 @@
 import com.palantir.atlasdb.api.TableRowSelection;
 import com.palantir.atlasdb.impl.TableMetadataCache;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import javax.inject.Inject;
 
 public class AtlasJacksonModule {
     private final TableMetadataCache cache;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasSerializers.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasSerializers.java
index 67b1e065866..a039f148e59 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasSerializers.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasSerializers.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-import java.util.Set;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.google.common.io.BaseEncoding;
 import com.google.common.primitives.UnsignedBytes;
@@ -33,6 +30,8 @@
 import com.palantir.atlasdb.table.description.NameMetadataDescription;
 import com.palantir.atlasdb.table.description.NamedColumnDescription;
 import com.palantir.util.Pair;
+import java.io.IOException;
+import java.util.Set;
 
 public final class AtlasSerializers {
 
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenDeserializer.java
index 5ac68576bbe..74ba3218aa7 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenDeserializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenDeserializer.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.DeserializationContext;
@@ -25,6 +23,7 @@
 import com.palantir.atlasdb.api.TableCell;
 import com.palantir.atlasdb.api.TableRange;
 import com.palantir.atlasdb.api.TableRowResult;
+import java.io.IOException;
 
 public class RangeTokenDeserializer extends StdDeserializer {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenSerializer.java
index 460d3b51403..0d5f0381913 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenSerializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenSerializer.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-
-import javax.inject.Inject;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import com.palantir.atlasdb.api.RangeToken;
+import java.io.IOException;
+import javax.inject.Inject;
 
 public class RangeTokenSerializer extends StdSerializer {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellDeserializer.java
index 20fae15fc3d..1f76b62fc2b 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellDeserializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellDeserializer.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -25,6 +23,7 @@
 import com.palantir.atlasdb.impl.TableMetadataCache;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
 
 public class TableCellDeserializer extends StdDeserializer {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellSerializer.java
index af0ad5307ae..943158770e5 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellSerializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellSerializer.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
@@ -29,6 +27,7 @@
 import com.palantir.atlasdb.table.description.DynamicColumnDescription;
 import com.palantir.atlasdb.table.description.NamedColumnDescription;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
 
 public class TableCellSerializer extends StdSerializer {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValDeserializer.java
index 79f4a5b722b..d1968baf98e 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValDeserializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValDeserializer.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-import java.util.Map;
-
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -26,6 +23,8 @@
 import com.palantir.atlasdb.impl.TableMetadataCache;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
+import java.util.Map;
 
 public class TableCellValDeserializer extends StdDeserializer {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValSerializer.java
index f498f433f43..766b4165ab1 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValSerializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValSerializer.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
@@ -31,6 +27,9 @@
 import com.palantir.atlasdb.table.description.DynamicColumnDescription;
 import com.palantir.atlasdb.table.description.NamedColumnDescription;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
+import java.util.Map.Entry;
+import java.util.Set;
 
 public class TableCellValSerializer extends StdSerializer {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataDeserializer.java
index dbe92dfedf0..459d6ff6f34 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataDeserializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataDeserializer.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -42,6 +37,10 @@
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
 import com.palantir.common.persist.Persistable;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
 
 public class TableMetadataDeserializer extends StdDeserializer {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataSerializer.java
index 28e3e3245a1..6e40a84f007 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataSerializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataSerializer.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
@@ -33,6 +31,7 @@
 import com.palantir.atlasdb.table.description.NameMetadataDescription;
 import com.palantir.atlasdb.table.description.NamedColumnDescription;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
 
 public class TableMetadataSerializer extends StdSerializer {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeDeserializer.java
index 9c77de430d1..a38d480670f 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeDeserializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeDeserializer.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -25,6 +23,7 @@
 import com.palantir.atlasdb.impl.TableMetadataCache;
 import com.palantir.atlasdb.keyvalue.api.RangeRequests;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
 
 public class TableRangeDeserializer extends StdDeserializer {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeSerializer.java
index 42b499015bd..7f9eddee614 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeSerializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeSerializer.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
@@ -24,6 +22,7 @@
 import com.palantir.atlasdb.api.TableRange;
 import com.palantir.atlasdb.impl.TableMetadataCache;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
 
 public class TableRangeSerializer extends StdSerializer {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultDeserializer.java
index 431618cc4a0..9ba606ca168 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultDeserializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultDeserializer.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -31,6 +27,9 @@
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.table.description.NamedColumnDescription;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
 
 public class TableRowResultDeserializer extends StdDeserializer {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultSerializer.java
index 59662dc94c5..1b2a94ea90e 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultSerializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultSerializer.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.SortedMap;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
@@ -32,6 +27,10 @@
 import com.palantir.atlasdb.table.description.DynamicColumnDescription;
 import com.palantir.atlasdb.table.description.NamedColumnDescription;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.SortedMap;
 
 public class TableRowResultSerializer extends StdSerializer {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionDeserializer.java
index 5658992a327..280d05a79e9 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionDeserializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionDeserializer.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -26,6 +24,7 @@
 import com.palantir.atlasdb.impl.TableMetadataCache;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
 
 public class TableRowSelectionDeserializer extends StdDeserializer {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionSerializer.java
index b34b9776c3a..56e4e5441b9 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionSerializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionSerializer.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
@@ -24,6 +22,7 @@
 import com.palantir.atlasdb.api.TableRowSelection;
 import com.palantir.atlasdb.impl.TableMetadataCache;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
 
 public class TableRowSelectionSerializer extends StdSerializer {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/proto/fork/ForkedJsonFormat.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/proto/fork/ForkedJsonFormat.java
index 5dc91d5a481..136ac0f75fb 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/proto/fork/ForkedJsonFormat.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/proto/fork/ForkedJsonFormat.java
@@ -15,18 +15,6 @@
  */
 package com.palantir.atlasdb.proto.fork;
 
-import java.io.IOException;
-import java.math.BigInteger;
-import java.nio.CharBuffer;
-import java.text.CharacterIterator;
-import java.text.StringCharacterIterator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import com.google.common.io.BaseEncoding;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Descriptors.Descriptor;
@@ -39,6 +27,17 @@
 import com.google.protobuf.UnknownFieldSet;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import com.palantir.logsafe.exceptions.SafeRuntimeException;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.nio.CharBuffer;
+import java.text.CharacterIterator;
+import java.text.StringCharacterIterator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Forked version of com.googlecode.protobuf.format.JsonFormat from protobuf-java-format-1.2
diff --git a/atlasdb-service/src/test/java/com/palantir/atlasdb/impl/AtlasDbServiceImplTest.java b/atlasdb-service/src/test/java/com/palantir/atlasdb/impl/AtlasDbServiceImplTest.java
index f9cb014dba9..0ee64ec83c3 100644
--- a/atlasdb-service/src/test/java/com/palantir/atlasdb/impl/AtlasDbServiceImplTest.java
+++ b/atlasdb-service/src/test/java/com/palantir/atlasdb/impl/AtlasDbServiceImplTest.java
@@ -19,12 +19,11 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import org.junit.Before;
+import org.junit.Test;
 
 public class AtlasDbServiceImplTest {
     private KeyValueService kvs;
diff --git a/atlasdb-service/src/test/java/com/palantir/atlasdb/jackson/AtlasDeserializersTest.java b/atlasdb-service/src/test/java/com/palantir/atlasdb/jackson/AtlasDeserializersTest.java
index e5c61df1ff4..215db07f357 100644
--- a/atlasdb-service/src/test/java/com/palantir/atlasdb/jackson/AtlasDeserializersTest.java
+++ b/atlasdb-service/src/test/java/com/palantir/atlasdb/jackson/AtlasDeserializersTest.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
@@ -25,6 +22,8 @@
 import com.palantir.atlasdb.table.description.NameComponentDescription;
 import com.palantir.atlasdb.table.description.NameMetadataDescription;
 import com.palantir.atlasdb.table.description.ValueType;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class AtlasDeserializersTest {
     private static final NameMetadataDescription NAME_METADATA_DESCRIPTION = NameMetadataDescription.create(
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractGetCandidateCellsForSweepingTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractGetCandidateCellsForSweepingTest.java
index f71f9f81d98..681058b43d1 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractGetCandidateCellsForSweepingTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractGetCandidateCellsForSweepingTest.java
@@ -18,13 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Iterators;
@@ -41,6 +34,11 @@
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.common.base.ClosableIterator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.junit.Before;
+import org.junit.Test;
 
 public abstract class AbstractGetCandidateCellsForSweepingTest {
     private final KvsManager kvsManager;
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueServiceTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueServiceTest.java
index 2075bc20b0c..f34dd2aef6b 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueServiceTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueServiceTest.java
@@ -27,28 +27,6 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.ArrayUtils;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
@@ -89,6 +67,26 @@
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.common.exception.AtlasDbDependencyException;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.ArrayUtils;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
 
 public abstract class AbstractKeyValueServiceTest {
     private final KvsManager kvsManager;
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractMultiCasTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractMultiCasTest.java
index f99c64efc90..936f2f3d161 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractMultiCasTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractMultiCasTest.java
@@ -18,14 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.encoding.PtBytes;
@@ -33,6 +25,12 @@
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 public class AbstractMultiCasTest {
     private static final byte[] ROW_1 = PtBytes.toBytes("row1");
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AssertLockedKeyValueService.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AssertLockedKeyValueService.java
index 67848988da5..1db6f0f19fb 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AssertLockedKeyValueService.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AssertLockedKeyValueService.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Arrays;
-import java.util.Map;
-import java.util.SortedMap;
-
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -33,6 +29,9 @@
 import com.palantir.lock.LockRequest;
 import com.palantir.lock.LockService;
 import com.palantir.logsafe.Preconditions;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.SortedMap;
 
 public class AssertLockedKeyValueService extends ForwardingKeyValueService {
     final KeyValueService delegate;
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TestDataBuilder.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TestDataBuilder.java
index d1dd9073e30..b17024d2f2e 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TestDataBuilder.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TestDataBuilder.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
-
 import com.google.common.collect.Maps;
 import com.google.common.primitives.Ints;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
 
 public class TestDataBuilder {
     private final KeyValueService kvs;
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TestResourceManager.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TestResourceManager.java
index 2bbf454072f..7aa5683a314 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TestResourceManager.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TestResourceManager.java
@@ -16,17 +16,15 @@
 
 package com.palantir.atlasdb.keyvalue.impl;
 
+import com.google.common.base.Suppliers;
+import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.transaction.api.TransactionManager;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Supplier;
-
 import org.junit.rules.ExternalResource;
 
-import com.google.common.base.Suppliers;
-import com.palantir.atlasdb.keyvalue.api.KeyValueService;
-import com.palantir.atlasdb.transaction.api.TransactionManager;
-
 public class TestResourceManager extends ExternalResource implements KvsManager, TransactionManagerManager {
     private final Supplier getKvsSupplier;
     private final List closeableResources = new ArrayList<>();
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TrackingKeyValueService.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TrackingKeyValueService.java
index f2b17a645d2..cdf070ea634 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TrackingKeyValueService.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TrackingKeyValueService.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
@@ -32,6 +29,8 @@
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.common.base.ClosableIterator;
+import java.util.Map;
+import java.util.Set;
 
 public class TrackingKeyValueService extends ForwardingKeyValueService {
     private final Set tablesWrittenTo = Sets.newSetFromMap(Maps.newConcurrentMap());
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TransactionManagerManager.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TransactionManagerManager.java
index 9ba43ac47e1..0a5f31d9aa8 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TransactionManagerManager.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TransactionManagerManager.java
@@ -16,9 +16,8 @@
 
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Optional;
-
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.Optional;
 
 public interface TransactionManagerManager {
     /**
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractBackgroundSweeperIntegrationTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractBackgroundSweeperIntegrationTest.java
index 6af4e696647..1b8dced0507 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractBackgroundSweeperIntegrationTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractBackgroundSweeperIntegrationTest.java
@@ -15,17 +15,6 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-import java.util.function.LongSupplier;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import com.google.common.primitives.Ints;
@@ -57,6 +46,15 @@
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.lock.SingleLockService;
 import com.palantir.timestamp.InMemoryTimestampService;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.function.LongSupplier;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 public abstract class AbstractBackgroundSweeperIntegrationTest {
     static final TableReference TABLE_1 = TableReference.createFromFullyQualifiedName("foo.bar");
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweepTaskRunnerTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweepTaskRunnerTest.java
index 6a4cf4c9971..c9558ba2140 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweepTaskRunnerTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweepTaskRunnerTest.java
@@ -25,19 +25,6 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.LongSupplier;
-
-import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -55,6 +42,17 @@
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy;
 import com.palantir.atlasdb.transaction.impl.TransactionConstants;
 import com.palantir.util.Pair;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.LongSupplier;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
 
 public abstract class AbstractSweepTaskRunnerTest extends AbstractSweepTest {
     protected static final int DEFAULT_BATCH_SIZE = 1000;
@@ -409,4 +407,3 @@ private SweepResults partialSweep(long ts) {
         return results;
     }
 }
-
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweepTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweepTest.java
index cd2866f6eaa..9201bf49eda 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweepTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweepTest.java
@@ -19,15 +19,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
@@ -52,6 +43,13 @@
 import com.palantir.atlasdb.transaction.service.TransactionServices;
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.timestamp.InMemoryTimestampService;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import org.junit.Before;
+import org.junit.Test;
 
 public abstract class AbstractSweepTest {
     protected static final String FULL_TABLE_NAME = "test_table.xyz_atlasdb_sweeper_test";
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractTargetedSweepTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractTargetedSweepTest.java
index 7cc05984b81..c1d69fd712b 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractTargetedSweepTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractTargetedSweepTest.java
@@ -19,11 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
-import java.util.Optional;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -42,6 +37,9 @@
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.lock.v2.TimelockService;
+import java.util.Optional;
+import org.junit.Before;
+import org.junit.Test;
 
 public class AbstractTargetedSweepTest extends AbstractSweepTest {
     private static final TableReference TABLE_TO_BE_DROPPED = TableReference.createFromFullyQualifiedName("ts.drop");
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTestUtils.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTestUtils.java
index 570340f0e31..e1e1d5fd13b 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTestUtils.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTestUtils.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import java.util.function.Supplier;
-
-import org.awaitility.Awaitility;
-import org.awaitility.Duration;
-
 import com.palantir.atlasdb.cleaner.NoOpCleaner;
 import com.palantir.atlasdb.cleaner.api.Cleaner;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -51,6 +46,9 @@
 import com.palantir.timestamp.InMemoryTimestampService;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
+import java.util.function.Supplier;
+import org.awaitility.Awaitility;
+import org.awaitility.Duration;
 
 public final class SweepTestUtils {
     private SweepTestUtils() {}
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperServiceImplIntegrationTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperServiceImplIntegrationTest.java
index 9491931490b..e58ec709a8e 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperServiceImplIntegrationTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperServiceImplIntegrationTest.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy;
+import org.junit.Before;
+import org.junit.Test;
 
 public class SweeperServiceImplIntegrationTest extends AbstractBackgroundSweeperIntegrationTest {
     private SweeperService sweeperService;
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/progress/AbstractSweepProgressStoreTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/progress/AbstractSweepProgressStoreTest.java
index e8f866e17dc..0d1438d8267 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/progress/AbstractSweepProgressStoreTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/progress/AbstractSweepProgressStoreTest.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.progress;
 
-import java.util.Optional;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.encoding.PtBytes;
@@ -29,6 +22,11 @@
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.impl.KvsManager;
+import java.util.Optional;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 public abstract class AbstractSweepProgressStoreTest {
     private static final TableReference TABLE = TableReference.createFromFullyQualifiedName("foo.bar");
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/timestamp/AbstractDbTimestampBoundStoreTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/timestamp/AbstractDbTimestampBoundStoreTest.java
index 2abf5ba8344..f0c883453de 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/timestamp/AbstractDbTimestampBoundStoreTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/timestamp/AbstractDbTimestampBoundStoreTest.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.timestamp;
 
+import com.palantir.timestamp.TimestampBoundStore;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.palantir.timestamp.TimestampBoundStore;
-
 public abstract class AbstractDbTimestampBoundStoreTest {
     protected TimestampBoundStore store;
 
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/timestamp/AbstractTimestampServiceTests.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/timestamp/AbstractTimestampServiceTests.java
index 91748f3d5d3..997f676de87 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/timestamp/AbstractTimestampServiceTests.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/timestamp/AbstractTimestampServiceTests.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.atlasdb.timestamp;
 
+import com.palantir.timestamp.TimestampManagementService;
+import com.palantir.timestamp.TimestampRange;
+import com.palantir.timestamp.TimestampService;
 import java.util.Set;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
-import com.palantir.timestamp.TimestampManagementService;
-import com.palantir.timestamp.TimestampRange;
-import com.palantir.timestamp.TimestampService;
-
 public abstract class AbstractTimestampServiceTests {
     private static final long ONE_MILLION = 1_000_000;
     private static final long TWO_MILLION = 2 * ONE_MILLION;
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractSerializableTransactionTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractSerializableTransactionTest.java
index a0f6ae87360..75fa81be2eb 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractSerializableTransactionTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractSerializableTransactionTest.java
@@ -20,19 +20,6 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.BrokenBarrierException;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-
-import org.junit.Assert;
-import org.junit.Test;
-
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -69,6 +56,17 @@
 import com.palantir.common.base.Throwables;
 import com.palantir.common.concurrent.PTExecutors;
 import com.palantir.lock.impl.LegacyTimelockService;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.BrokenBarrierException;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import org.junit.Assert;
+import org.junit.Test;
 
 @SuppressWarnings("CheckReturnValue")
 public abstract class AbstractSerializableTransactionTest extends AbstractTransactionTest {
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionTest.java
index 902468848b1..d64b3d11b51 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionTest.java
@@ -24,23 +24,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Random;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.FutureTask;
-import java.util.stream.Collectors;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
@@ -95,6 +78,21 @@
 import com.palantir.lock.impl.LegacyTimelockService;
 import com.palantir.util.Pair;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Random;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.FutureTask;
+import java.util.stream.Collectors;
+import org.junit.Test;
 
 @SuppressWarnings({"checkstyle:all","DefaultCharset"}) // TODO(someonebored): clean this horrible test class up!
 public abstract class AbstractTransactionTest extends TransactionTestSetup {
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/CommitLockTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/CommitLockTest.java
index f8eb274aed0..9bb9f8125e7 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/CommitLockTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/CommitLockTest.java
@@ -18,16 +18,6 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import java.util.Map;
-import java.util.Optional;
-
-import org.junit.Assume;
-import org.junit.ClassRule;
-import org.junit.experimental.theories.DataPoints;
-import org.junit.experimental.theories.Theories;
-import org.junit.experimental.theories.Theory;
-import org.junit.runner.RunWith;
-
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -52,6 +42,14 @@
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.v2.LockRequest;
 import com.palantir.lock.v2.LockResponse;
+import java.util.Map;
+import java.util.Optional;
+import org.junit.Assume;
+import org.junit.ClassRule;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
 
 @RunWith(Theories.class)
 public class CommitLockTest extends TransactionTestSetup {
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TestConflictDetectionManagers.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TestConflictDetectionManagers.java
index 772bd1ee636..47b54a5bd5f 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TestConflictDetectionManagers.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TestConflictDetectionManagers.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Map;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.cache.CacheLoader;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
+import java.util.Map;
 
 public final class TestConflictDetectionManagers {
     private TestConflictDetectionManagers() {}
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TestTransactionManagerImpl.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TestTransactionManagerImpl.java
index 604295f5c78..a9825b0db0f 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TestTransactionManagerImpl.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TestTransactionManagerImpl.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ExecutorService;
-
 import com.google.common.base.Suppliers;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.palantir.atlasdb.cache.DefaultTimestampCache;
@@ -41,6 +36,10 @@
 import com.palantir.lock.impl.LegacyTimelockService;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
 
 public class TestTransactionManagerImpl extends SerializableTransactionManager implements TestTransactionManager {
     private static final TransactionConfig TRANSACTION_CONFIG = ImmutableTransactionConfig.builder().build();
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionTestSetup.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionTestSetup.java
index 565348477ef..38b1862a3bd 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionTestSetup.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionTestSetup.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Map;
-
-import org.junit.Before;
-
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -54,6 +50,8 @@
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
 import com.palantir.util.Pair;
+import java.util.Map;
+import org.junit.Before;
 
 public abstract class TransactionTestSetup {
     protected static final TableReference TEST_TABLE = TableReference.createFromFullyQualifiedName(
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetricsAssert.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetricsAssert.java
index f620f9c0bb3..852381b1351 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetricsAssert.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetricsAssert.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.atlasdb.transaction.impl.metrics;
 
-import java.util.function.LongConsumer;
-
-import org.assertj.core.api.AbstractAssert;
-import org.assertj.core.api.WritableAssertionInfo;
-import org.assertj.core.internal.Objects;
-
 import com.codahale.metrics.Metric;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.logging.LoggingArgs;
 import com.palantir.tritium.metrics.registry.MetricName;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import java.util.function.LongConsumer;
+import org.assertj.core.api.AbstractAssert;
+import org.assertj.core.api.WritableAssertionInfo;
+import org.assertj.core.internal.Objects;
 
 public class TransactionOutcomeMetricsAssert extends
         AbstractAssert {
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/AllAtlasDbFastTests.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/AllAtlasDbFastTests.java
index 1a2e815d80c..b3db7a9b965 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/AllAtlasDbFastTests.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/AllAtlasDbFastTests.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
 import com.palantir.atlasdb.cleaner.AsyncPuncherTest;
 import com.palantir.atlasdb.cleaner.InMemorySweepTaskRunnerTest;
 import com.palantir.atlasdb.cleaner.PuncherTest;
 import com.palantir.atlasdb.compress.CompressionUtilsTest;
 import com.palantir.atlasdb.keyvalue.impl.RangeRequestsTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
 @SuiteClasses({
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/AtlasDbTestCase.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/AtlasDbTestCase.java
index ac59acadf02..c0e842ebcf1 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/AtlasDbTestCase.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/AtlasDbTestCase.java
@@ -17,12 +17,6 @@
 
 import static org.mockito.Mockito.spy;
 
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-
-import org.junit.After;
-import org.junit.Before;
-
 import com.google.common.util.concurrent.MoreExecutors;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
@@ -53,6 +47,10 @@
 import com.palantir.lock.LockService;
 import com.palantir.lock.impl.LockServiceImpl;
 import com.palantir.timestamp.InMemoryTimestampService;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import org.junit.After;
+import org.junit.Before;
 
 public class AtlasDbTestCase {
     protected LockClient lockClient;
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/AsyncPuncherTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/AsyncPuncherTest.java
index 18b5b5e748f..f1f6738d7ba 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/AsyncPuncherTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/AsyncPuncherTest.java
@@ -21,17 +21,15 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.util.Optional;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.base.Suppliers;
 import com.palantir.common.time.Clock;
 import com.palantir.common.time.SystemClock;
 import com.palantir.timestamp.InMemoryTimestampService;
 import com.palantir.timestamp.TimestampService;
+import java.util.Optional;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 public class AsyncPuncherTest {
 
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/InMemorySweepTaskRunnerTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/InMemorySweepTaskRunnerTest.java
index 22879a3af58..4ab456fba9b 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/InMemorySweepTaskRunnerTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/InMemorySweepTaskRunnerTest.java
@@ -15,19 +15,17 @@
  */
 package com.palantir.atlasdb.cleaner;
 
+import com.palantir.atlasdb.keyvalue.api.SweepResults;
+import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
+import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
+import com.palantir.atlasdb.sweep.AbstractSweepTaskRunnerTest;
 import java.util.Optional;
 import java.util.stream.IntStream;
-
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Assert;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import com.palantir.atlasdb.keyvalue.api.SweepResults;
-import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
-import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
-import com.palantir.atlasdb.sweep.AbstractSweepTaskRunnerTest;
-
 public class InMemorySweepTaskRunnerTest extends AbstractSweepTaskRunnerTest {
     @ClassRule
     public static final TestResourceManager TRM = TestResourceManager.inMemory();
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/PuncherTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/PuncherTest.java
index 23176baac2a..1644fde644b 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/PuncherTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/PuncherTest.java
@@ -17,21 +17,19 @@
 
 import static org.junit.Assert.assertEquals;
 
+import com.google.common.base.Suppliers;
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
+import com.palantir.common.time.Clock;
 import java.util.Collection;
 import java.util.function.Supplier;
-
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import com.google.common.base.Suppliers;
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.keyvalue.api.KeyValueService;
-import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
-import com.palantir.common.time.Clock;
-
 @RunWith(Parameterized.class)
 public class PuncherTest {
     private static final long GRANULARITY_MILLIS = 10;
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/compress/CompressionUtilsTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/compress/CompressionUtilsTest.java
index b537d7cb5cb..5781e734ba7 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/compress/CompressionUtilsTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/compress/CompressionUtilsTest.java
@@ -19,12 +19,10 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import com.palantir.atlasdb.table.description.ColumnValueDescription.Compression;
 import java.util.Arrays;
-
 import org.junit.Test;
 
-import com.palantir.atlasdb.table.description.ColumnValueDescription.Compression;
-
 public class CompressionUtilsTest {
     @Test
     public void testCompressAndDecompress() {
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/health/MetricsBasedTimelockHealthCheckTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/health/MetricsBasedTimelockHealthCheckTest.java
index 8dfd9bc980c..66de6d2f54a 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/health/MetricsBasedTimelockHealthCheckTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/health/MetricsBasedTimelockHealthCheckTest.java
@@ -19,13 +19,11 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Test;
-
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.atlasdb.transaction.impl.InstrumentedTimelockService;
 import com.palantir.lock.v2.TimelockService;
+import java.util.concurrent.TimeUnit;
+import org.junit.Test;
 
 public class MetricsBasedTimelockHealthCheckTest {
     private static final long METRICS_TICK_INTERVAL = TimeUnit.SECONDS.toMillis(5);
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemorySerializableTransactionTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemorySerializableTransactionTest.java
index 685fa39f9bc..9883feec89d 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemorySerializableTransactionTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemorySerializableTransactionTest.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.keyvalue;
 
-import org.junit.ClassRule;
-
 import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
 import com.palantir.atlasdb.transaction.impl.AbstractSerializableTransactionTest;
+import org.junit.ClassRule;
 
 public class MemorySerializableTransactionTest extends AbstractSerializableTransactionTest {
     @ClassRule
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemoryTransactionTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemoryTransactionTest.java
index 29141b71ed9..0ecedc5aec5 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemoryTransactionTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemoryTransactionTest.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.keyvalue;
 
-import org.junit.ClassRule;
-
 import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
 import com.palantir.atlasdb.transaction.impl.AbstractTransactionTest;
+import org.junit.ClassRule;
 
 public class MemoryTransactionTest extends AbstractTransactionTest {
     @ClassRule
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/ColumnRangeSelectionTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/ColumnRangeSelectionTest.java
index bbd9abbd587..c043ea1905e 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/ColumnRangeSelectionTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/ColumnRangeSelectionTest.java
@@ -19,10 +19,9 @@
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import org.junit.Test;
 
 public class ColumnRangeSelectionTest {
     private static final byte[] BYTES_1 = PtBytes.toBytes("aaaaaaa");
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/RangeRequestTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/RangeRequestTest.java
index f76134ca7c6..ef4ca4484dd 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/RangeRequestTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/RangeRequestTest.java
@@ -17,11 +17,10 @@
 
 import static org.junit.Assert.assertEquals;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.RangeRequests;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class RangeRequestTest {
 
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/RangeRequestsTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/RangeRequestsTest.java
index 94109ecb6f7..3e80a50a485 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/RangeRequestsTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/RangeRequestsTest.java
@@ -17,15 +17,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.palantir.atlasdb.encoding.PtBytes;
+import com.palantir.atlasdb.keyvalue.api.RangeRequests;
 import java.util.Arrays;
 import java.util.Random;
-
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.palantir.atlasdb.encoding.PtBytes;
-import com.palantir.atlasdb.keyvalue.api.RangeRequests;
-
 public class RangeRequestsTest {
 
     private static final byte[] BYTES_1 = PtBytes.toBytes("apple");
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueServiceTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueServiceTest.java
index 9267a0ff866..83bd21668d0 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueServiceTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueServiceTest.java
@@ -17,12 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.Map;
-
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -30,6 +24,10 @@
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.util.Map;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.junit.Test;
 
 @SuppressWarnings({"checkstyle:Indentation", "checkstyle:RightCurly"}) // Expectations syntax
 public class TableSplittingKeyValueServiceTest {
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableTasksTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableTasksTest.java
index 3d5b77a76e5..dd6d161389e 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableTasksTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableTasksTest.java
@@ -15,17 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Collections;
-import java.util.Map.Entry;
-import java.util.Random;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Supplier;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.base.Suppliers;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableMap;
@@ -57,6 +46,15 @@
 import com.palantir.lock.LockServerOptions;
 import com.palantir.lock.impl.LockServiceImpl;
 import com.palantir.timestamp.InMemoryTimestampService;
+import java.util.Collections;
+import java.util.Map.Entry;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 public class TableTasksTest {
     private MetricsManager metricsManager;
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TracingKvsTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TracingKvsTest.java
index 51bf98015d2..20aacf6bb55 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TracingKvsTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TracingKvsTest.java
@@ -17,22 +17,20 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.palantir.tracing.Tracer;
+import com.palantir.tracing.api.Span;
+import com.palantir.tracing.api.SpanObserver;
+import com.palantir.tracing.api.SpanType;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import org.junit.ClassRule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.tracing.Tracer;
-import com.palantir.tracing.api.Span;
-import com.palantir.tracing.api.SpanObserver;
-import com.palantir.tracing.api.SpanType;
-
 public class TracingKvsTest extends AbstractKeyValueServiceTest {
     @ClassRule
     public static final TestResourceManager TRM = new TestResourceManager(() ->
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/ptobject/EncodingUtilsTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/ptobject/EncodingUtilsTest.java
index d56feb4aac9..28674d0b99f 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/ptobject/EncodingUtilsTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/ptobject/EncodingUtilsTest.java
@@ -19,15 +19,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.SortedMap;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -37,6 +28,13 @@
 import com.palantir.atlasdb.ptobject.EncodingUtils.EncodingType;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.util.crypto.Sha256Hash;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.SortedMap;
+import org.junit.Test;
 
 @SuppressWarnings("checkstyle:all")
 public class EncodingUtilsTest {
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/AbstractTaskCheckpointerTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/AbstractTaskCheckpointerTest.java
index 4abf577273c..49521c95ee2 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/AbstractTaskCheckpointerTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/AbstractTaskCheckpointerTest.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.atlasdb.schema;
 
+import com.google.common.collect.Maps;
+import com.palantir.atlasdb.AtlasDbTestCase;
+import com.palantir.atlasdb.transaction.api.Transaction;
+import com.palantir.atlasdb.transaction.api.TransactionTask;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Random;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.collect.Maps;
-import com.palantir.atlasdb.AtlasDbTestCase;
-import com.palantir.atlasdb.transaction.api.Transaction;
-import com.palantir.atlasdb.transaction.api.TransactionTask;
-
 public abstract class AbstractTaskCheckpointerTest extends AtlasDbTestCase {
     protected AbstractTaskCheckpointer checkpointer;
 
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/NamespaceTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/NamespaceTest.java
index 6418fcd19f9..6e4e990a30d 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/NamespaceTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/NamespaceTest.java
@@ -17,12 +17,10 @@
 
 import static org.junit.Assert.fail;
 
+import com.palantir.atlasdb.keyvalue.api.Namespace;
 import java.util.regex.Pattern;
-
 import org.junit.Test;
 
-import com.palantir.atlasdb.keyvalue.api.Namespace;
-
 public class NamespaceTest {
 
     private void expectSuccess(String string, Pattern pattern) {
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/TableMigratorTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/TableMigratorTest.java
index ee9ed94b101..48dd4ccbbca 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/TableMigratorTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/TableMigratorTest.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.schema;
 
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.apache.commons.lang3.mutable.MutableLong;
-import org.junit.Assert;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
@@ -50,6 +43,11 @@
 import com.palantir.common.base.AbortingVisitors;
 import com.palantir.common.base.BatchingVisitable;
 import com.palantir.common.concurrent.PTExecutors;
+import java.util.Map;
+import java.util.Map.Entry;
+import org.apache.commons.lang3.mutable.MutableLong;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class TableMigratorTest extends AtlasDbTestCase {
     @Test
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/IndexTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/IndexTest.java
index b70cd3a6ff8..3891193e1ad 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/IndexTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/IndexTest.java
@@ -17,13 +17,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Multimap;
@@ -44,6 +37,11 @@
 import com.palantir.atlasdb.table.description.Schemas;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.atlasdb.transaction.api.RuntimeTransactionTask;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 public class IndexTest extends AtlasDbTestCase {
 
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/IndexTestSchema.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/IndexTestSchema.java
index 496115b9c6b..8c1113fe228 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/IndexTestSchema.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/IndexTestSchema.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.schema.indexing;
 
-import java.io.File;
-
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.ValueByteOrder;
 import com.palantir.atlasdb.schema.AtlasSchema;
@@ -26,6 +24,7 @@
 import com.palantir.atlasdb.table.description.Schema;
 import com.palantir.atlasdb.table.description.TableDefinition;
 import com.palantir.atlasdb.table.description.ValueType;
+import java.io.File;
 
 public class IndexTestSchema implements AtlasSchema {
     public static final AtlasSchema INSTANCE = new IndexTestSchema();
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/StreamTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/StreamTest.java
index 5431f717b0b..8ed1e6829dc 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/StreamTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/StreamTest.java
@@ -27,30 +27,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Random;
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.output.ByteArrayOutputStream;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -92,6 +68,28 @@
 import com.palantir.common.concurrent.PTExecutors;
 import com.palantir.util.Pair;
 import com.palantir.util.crypto.Sha256Hash;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 @RunWith(Parameterized.class)
 public class StreamTest extends AtlasDbTestCase {
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/StreamTestSchema.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/StreamTestSchema.java
index e1f98902e49..52f5b380ac7 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/StreamTestSchema.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/StreamTestSchema.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.schema.stream;
 
-import java.io.File;
-
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.schema.AtlasSchema;
 import com.palantir.atlasdb.table.description.OptionalType;
 import com.palantir.atlasdb.table.description.Schema;
 import com.palantir.atlasdb.table.description.TableDefinition;
 import com.palantir.atlasdb.table.description.ValueType;
+import java.io.File;
 
 public class StreamTestSchema implements AtlasSchema {
     public static final AtlasSchema INSTANCE = new StreamTestSchema();
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStoreTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStoreTest.java
index f4d267b6421..559bf046dc3 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStoreTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStoreTest.java
@@ -17,14 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.OptionalLong;
-import java.util.concurrent.ExecutorService;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -34,6 +26,12 @@
 import com.palantir.atlasdb.sweep.SweepTestUtils;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.concurrent.PTExecutors;
+import java.util.OptionalLong;
+import java.util.concurrent.ExecutorService;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 public class SweepPriorityStoreTest {
     private ExecutorService exec;
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/progress/SweepProgressStoreTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/progress/SweepProgressStoreTest.java
index 5247da203b3..47fd796c05a 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/progress/SweepProgressStoreTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/progress/SweepProgressStoreTest.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.sweep.progress;
 
-import org.junit.ClassRule;
-
 import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
+import org.junit.ClassRule;
 
 public class SweepProgressStoreTest extends AbstractSweepProgressStoreTest {
     @ClassRule
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweepTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweepTest.java
index b2902ae2808..7c81826d8cd 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweepTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweepTest.java
@@ -22,15 +22,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -46,6 +37,13 @@
 import com.palantir.atlasdb.transaction.api.PreCommitCondition;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionConflictException;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 
 public class TargetedSweepTest extends AtlasDbTestCase {
     private static final TableReference TABLE_CONS = TableReference.createFromFullyQualifiedName("test.1");
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/CachingTransactionTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/CachingTransactionTest.java
index bed5c97b5e8..9ff5ece7e73 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/CachingTransactionTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/CachingTransactionTest.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.junit.Assert;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -35,6 +26,13 @@
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.Transaction;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class CachingTransactionTest {
     private static final byte[] ROW_BYTES = "row".getBytes();
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionTest.java
index ffb38586deb..9270115e219 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionTest.java
@@ -36,41 +36,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.math.BigInteger;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Random;
-import java.util.SortedMap;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.mutable.MutableInt;
-import org.apache.commons.lang3.mutable.MutableLong;
-import org.apache.commons.lang3.tuple.Pair;
-import org.hamcrest.Matchers;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.Sequence;
-import org.jmock.lib.concurrent.DeterministicScheduler;
-import org.jmock.lib.concurrent.Synchroniser;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
 import com.google.common.base.Joiner;
 import com.google.common.base.Suppliers;
 import com.google.common.base.Throwables;
@@ -138,6 +103,39 @@
 import com.palantir.lock.v2.LockImmutableTimestampResponse;
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.timestamp.TimestampService;
+import java.math.BigInteger;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Random;
+import java.util.SortedMap;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletionService;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorCompletionService;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.mutable.MutableInt;
+import org.apache.commons.lang3.mutable.MutableLong;
+import org.apache.commons.lang3.tuple.Pair;
+import org.hamcrest.Matchers;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.Sequence;
+import org.jmock.lib.concurrent.DeterministicScheduler;
+import org.jmock.lib.concurrent.Synchroniser;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
 
 @SuppressWarnings("checkstyle:all")
 public class SnapshotTransactionTest extends AtlasDbTestCase {
@@ -1179,7 +1177,7 @@ public void checkImmutableTsLockOnceIfThoroughlySwept_WithValidationOnReads() {
         transaction.get(TABLE_SWEPT_THOROUGH, ImmutableSet.of(TEST_CELL));
         transaction.commit();
         timelockService.unlock(ImmutableSet.of(res.getLock()));
-        
+
         verify(timelockService).refreshLockLeases(ImmutableSet.of(res.getLock()));
     }
 
@@ -1250,7 +1248,7 @@ public void checkImmutableTsLockAfterReadsForConservativeIfFlagIsSet() {
 
         transaction.get(TABLE_SWEPT_CONSERVATIVE, ImmutableSet.of(TEST_CELL));
         verify(timelockService).refreshLockLeases(ImmutableSet.of(res.getLock()));
-        
+
         transaction.commit();
         timelockService.unlock(ImmutableSet.of(res.getLock()));
 
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionManagerTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionManagerTest.java
index 7dfd4eae0be..bb72e727139 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionManagerTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionManagerTest.java
@@ -22,11 +22,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.util.UUID;
-
-import org.junit.ClassRule;
-import org.junit.Test;
-
 import com.google.common.util.concurrent.MoreExecutors;
 import com.palantir.atlasdb.cache.DefaultTimestampCache;
 import com.palantir.atlasdb.cleaner.NoOpCleaner;
@@ -48,6 +43,9 @@
 import com.palantir.lock.v2.TimestampAndPartition;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
+import java.util.UUID;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 public class TransactionManagerTest extends TransactionTestSetup {
     @ClassRule
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetricsTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetricsTest.java
index 0fb45496429..9aed911b837 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetricsTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetricsTest.java
@@ -17,12 +17,6 @@
 
 import static com.palantir.atlasdb.transaction.impl.metrics.TransactionOutcomeMetricsAssert.assertThat;
 
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.IntStream;
-
-import org.junit.Test;
-
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -31,6 +25,10 @@
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.IntStream;
+import org.junit.Test;
 
 public class TransactionOutcomeMetricsTest {
     private static final Namespace NAMESPACE = Namespace.DEFAULT_NAMESPACE;
diff --git a/build.gradle b/build.gradle
index f858a848eee..60962a16020 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,10 +15,9 @@ buildscript {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.9.8'
         classpath 'gradle.plugin.com.palantir.gradle.docker:gradle-docker:0.22.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:1.8.2'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.8.1'
         classpath 'gradle.plugin.com.palantir.gradle.gitversion:gradle-git-version:0.11.0'
         classpath 'com.palantir.sls-packaging:gradle-sls-packaging:3.8.1'
-        classpath 'com.netflix.nebula:nebula-dependency-recommender:8.0.0'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:13.2.0'
         classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0'
@@ -27,17 +26,11 @@ buildscript {
 
 plugins {
     id 'com.github.johnrengelman.shadow' version '5.1.0'
-    id 'com.palantir.configuration-resolver' version '0.4.0'
     id 'org.unbroken-dome.test-sets' version '2.1.1'
     id 'com.google.protobuf' version '0.8.10'
 }
 
-repositories {
-    mavenCentral()
-    maven {
-        url 'https://dl.bintray.com/palantir/releases/'
-    }
-}
+apply plugin: 'com.palantir.baseline'
 apply plugin: 'com.palantir.baseline-config'
 apply plugin: 'com.palantir.baseline-circleci'
 apply plugin: 'com.palantir.git-version'
@@ -57,17 +50,8 @@ task printLastVersion {
 
 allprojects {
     apply plugin: 'java-library'
-    apply plugin: 'nebula.dependency-recommender'
     apply plugin: 'org.inferred.processors'  // installs the "processor" configuration needed for baseline-error-prone
 
-    // temporary until this is merged/fixed inside gradle-processors
-    configurations.allProcessors {
-        canBeConsumed = false
-        attributes {
-            attribute Usage.USAGE_ATTRIBUTE, objects.named(Usage, Usage.JAVA_API)
-        }
-    }
-
     dependencyRecommendations {
         strategy OverrideTransitives
         propertiesFile file: project.rootProject.file('versions.props')
@@ -84,10 +68,16 @@ allprojects {
             }
         }
     }
+
+    repositories {
+        mavenCentral()
+        maven {
+            url 'https://dl.bintray.com/palantir/releases/'
+        }
+    }
 }
 
 subprojects {
-    apply plugin: 'com.palantir.configuration-resolver'
     task allDeps(type: DependencyReportTask) {}
 }
 
diff --git a/cassandra-partitioner/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/dht/AtlasDbOrderedPartitioner.java b/cassandra-partitioner/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/dht/AtlasDbOrderedPartitioner.java
index 30af0d390f3..c5a1a59ed01 100644
--- a/cassandra-partitioner/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/dht/AtlasDbOrderedPartitioner.java
+++ b/cassandra-partitioner/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/dht/AtlasDbOrderedPartitioner.java
@@ -15,6 +15,8 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.dht;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.security.SecureRandom;
@@ -22,7 +24,6 @@
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.apache.cassandra.dht.ByteOrderedPartitioner;
 import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.dht.Token;
@@ -33,9 +34,6 @@
 import org.apache.cassandra.utils.Pair;
 import org.apache.commons.lang3.ArrayUtils;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
 public class AtlasDbOrderedPartitioner extends ByteOrderedPartitioner {
     private final Random r = new SecureRandom();
     private final AtomicInteger indexCounter = new AtomicInteger(r.nextInt(6));
diff --git a/commons-annotations/src/main/java/com/palantir/common/annotation/Immutable.java b/commons-annotations/src/main/java/com/palantir/common/annotation/Immutable.java
index 440e7523b40..52276252b0b 100644
--- a/commons-annotations/src/main/java/com/palantir/common/annotation/Immutable.java
+++ b/commons-annotations/src/main/java/com/palantir/common/annotation/Immutable.java
@@ -31,4 +31,3 @@
 public @interface Immutable {
 // marker annotation
 }
-
diff --git a/commons-api/src/main/java/com/palantir/util/VersionStrings.java b/commons-api/src/main/java/com/palantir/util/VersionStrings.java
index 9e4fd876ad9..398ad3674a6 100644
--- a/commons-api/src/main/java/com/palantir/util/VersionStrings.java
+++ b/commons-api/src/main/java/com/palantir/util/VersionStrings.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.util;
 
-import java.util.Iterator;
-
 import com.google.common.base.Splitter;
+import java.util.Iterator;
 
 public final class VersionStrings {
     private VersionStrings() {
diff --git a/commons-api/src/main/java/com/palantir/util/jmx/AbstractOperationStats.java b/commons-api/src/main/java/com/palantir/util/jmx/AbstractOperationStats.java
index 2daf25f193c..54dc4a21b17 100644
--- a/commons-api/src/main/java/com/palantir/util/jmx/AbstractOperationStats.java
+++ b/commons-api/src/main/java/com/palantir/util/jmx/AbstractOperationStats.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.util.jmx;
 
+import com.palantir.annotations.PgNotExtendableApi;
+import com.palantir.annotations.PgPublicApi;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicLong;
-
 import javax.management.MXBean;
 
-import com.palantir.annotations.PgNotExtendableApi;
-import com.palantir.annotations.PgPublicApi;
-
 /*
  * TODO (carrino) consider abstracting this a little bit further so that this
  * isn't time-specific (e.g., this class could be useful for tracking statistics
diff --git a/commons-api/src/main/java/com/palantir/util/sql/SqlStats.java b/commons-api/src/main/java/com/palantir/util/sql/SqlStats.java
index 7af0bf29e8b..430471c9a2c 100644
--- a/commons-api/src/main/java/com/palantir/util/sql/SqlStats.java
+++ b/commons-api/src/main/java/com/palantir/util/sql/SqlStats.java
@@ -15,6 +15,8 @@
  */
 package com.palantir.util.sql;
 
+import com.palantir.util.JMXUtils;
+import com.palantir.util.Pair;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -22,9 +24,6 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.palantir.util.JMXUtils;
-import com.palantir.util.Pair;
-
 /**
  * MXBean which tracks statistics for all SQL queries made by the server.
  */
@@ -173,4 +172,3 @@ public void incrementClearTempTableByTruncate() {
         clearTempTableByTruncateCount.incrementAndGet();
     }
 }
-
diff --git a/commons-db/src/main/java/com/palantir/db/oracle/JdbcHandler.java b/commons-db/src/main/java/com/palantir/db/oracle/JdbcHandler.java
index 8e5d6955fe2..69787a39387 100644
--- a/commons-db/src/main/java/com/palantir/db/oracle/JdbcHandler.java
+++ b/commons-db/src/main/java/com/palantir/db/oracle/JdbcHandler.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.db.oracle;
 
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import java.io.OutputStream;
 import java.sql.Blob;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
 
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
 /**
  * JdbcHandler allows Oracle dependent logic to be injected into the SQL
  * dependent classes that support both Legacy DB and AtlasDB's Dbkvs
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/ConnectionSupplier.java b/commons-db/src/main/java/com/palantir/nexus/db/ConnectionSupplier.java
index a103b0694c6..c655fa87f34 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/ConnectionSupplier.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/ConnectionSupplier.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.nexus.db;
 
+import com.palantir.exception.PalantirSqlException;
 import java.io.Closeable;
 import java.sql.Connection;
 import java.util.function.Supplier;
 
-import com.palantir.exception.PalantirSqlException;
-
 public interface ConnectionSupplier extends Supplier, Closeable {
 
     /**
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/DBType.java b/commons-db/src/main/java/com/palantir/nexus/db/DBType.java
index 405fc216a23..2e7c9dac2f5 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/DBType.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/DBType.java
@@ -15,13 +15,11 @@
  */
 package com.palantir.nexus.db;
 
-import java.sql.Connection;
-
-import javax.annotation.Nullable;
-
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.logsafe.exceptions.SafeRuntimeException;
 import com.palantir.sql.Connections;
+import java.sql.Connection;
+import javax.annotation.Nullable;
 
 /**
  * Extensibility point for adding more type of databases.
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/ReentrantConnectionSupplier.java b/commons-db/src/main/java/com/palantir/nexus/db/ReentrantConnectionSupplier.java
index 79b54b29a1a..e597df7dc56 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/ReentrantConnectionSupplier.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/ReentrantConnectionSupplier.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.nexus.db;
 
+import com.palantir.exception.PalantirSqlException;
 import java.io.Closeable;
 import java.sql.Connection;
 
-import com.palantir.exception.PalantirSqlException;
-
 public interface ReentrantConnectionSupplier extends ConnectionSupplier, Closeable {
 
     /**
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/ResourceCreationLocation.java b/commons-db/src/main/java/com/palantir/nexus/db/ResourceCreationLocation.java
index 92fd1dc9845..5f84a820dbd 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/ResourceCreationLocation.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/ResourceCreationLocation.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.nexus.db;
 
+import com.google.common.base.MoreObjects;
 import java.io.Serializable;
-
 import org.joda.time.format.ISODateTimeFormat;
 
-import com.google.common.base.MoreObjects;
-
 /**
  * A RuntimeException that represents the creation location of a resource (e.g. JDBC Connection or
  * ResultSet) to help identify potential resource leaks. This instance tracks the stack trace of
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/ThreadConfinedProxy.java b/commons-db/src/main/java/com/palantir/nexus/db/ThreadConfinedProxy.java
index b2a9b5a0ef6..960d258a737 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/ThreadConfinedProxy.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/ThreadConfinedProxy.java
@@ -15,24 +15,21 @@
  */
 package com.palantir.nexus.db;
 
+import com.google.common.base.Throwables;
+import com.google.common.reflect.AbstractInvocationHandler;
+import com.palantir.common.proxy.DelegatingInvocationHandler;
+import com.palantir.logsafe.Preconditions;
+import com.palantir.util.AssertUtils;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.concurrent.Callable;
-
 import javax.annotation.concurrent.GuardedBy;
-
 import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Throwables;
-import com.google.common.reflect.AbstractInvocationHandler;
-import com.palantir.common.proxy.DelegatingInvocationHandler;
-import com.palantir.logsafe.Preconditions;
-import com.palantir.util.AssertUtils;
-
 /**
  *  Dynamic Proxy for confining an object to a particular thread, but allowing explicit handoff.
  *
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/monitoring/profiler/SimpleSqlProfiler.java b/commons-db/src/main/java/com/palantir/nexus/db/monitoring/profiler/SimpleSqlProfiler.java
index 4db7f655891..d46d942c419 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/monitoring/profiler/SimpleSqlProfiler.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/monitoring/profiler/SimpleSqlProfiler.java
@@ -15,21 +15,18 @@
  */
 package com.palantir.nexus.db.monitoring.profiler;
 
-import java.util.Collection;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import javax.annotation.Nullable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.palantir.common.concurrent.ExecutorInheritableThreadLocal;
 import com.palantir.util.AssertUtils;
 import com.palantir.util.sql.SqlCallStats;
+import java.util.Collection;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 enum SimpleSqlProfiler implements SqlProfiler {
     INSTANCE;
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/monitoring/profiler/SqlProfiler.java b/commons-db/src/main/java/com/palantir/nexus/db/monitoring/profiler/SqlProfiler.java
index de390afa84a..b0cab90624f 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/monitoring/profiler/SqlProfiler.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/monitoring/profiler/SqlProfiler.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.nexus.db.monitoring.profiler;
 
-import java.util.Collection;
-
 import com.palantir.nexus.db.sql.BasicSQL;
 import com.palantir.util.sql.SqlCallStats;
+import java.util.Collection;
 
 /**
  * Code extracted from {@link BasicSQL}. This provides one of several competing and overlapping
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/monitoring/timer/CombinedSqlTimer.java b/commons-db/src/main/java/com/palantir/nexus/db/monitoring/timer/CombinedSqlTimer.java
index 3758a486c82..341df7dee6e 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/monitoring/timer/CombinedSqlTimer.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/monitoring/timer/CombinedSqlTimer.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.nexus.db.monitoring.timer;
 
-import java.util.List;
-
 import com.google.common.collect.Lists;
+import java.util.List;
 
 final class CombinedSqlTimer implements SqlTimer {
     private final List sqlTimers;
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/monitoring/timer/SqlStatsSqlTimer.java b/commons-db/src/main/java/com/palantir/nexus/db/monitoring/timer/SqlStatsSqlTimer.java
index 163c83563bf..4dd70a60e05 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/monitoring/timer/SqlStatsSqlTimer.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/monitoring/timer/SqlStatsSqlTimer.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.nexus.db.monitoring.timer;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.nexus.db.sql.monitoring.logger.SqlLoggers;
 import com.palantir.util.jmx.OperationTimer;
 import com.palantir.util.jmx.OperationTimer.TimingState;
 import com.palantir.util.timer.LoggingOperationTimer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 final class SqlStatsSqlTimer implements SqlTimer {
     private final Logger logger = SqlLoggers.LOGGER;
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/pool/BaseConnectionManager.java b/commons-db/src/main/java/com/palantir/nexus/db/pool/BaseConnectionManager.java
index 9045e977a17..3fffac77387 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/pool/BaseConnectionManager.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/pool/BaseConnectionManager.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.nexus.db.pool;
 
+import com.palantir.exception.PalantirSqlException;
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import com.palantir.exception.PalantirSqlException;
-
 public abstract class BaseConnectionManager implements ConnectionManager {
     @Override
     public Connection getConnectionUnchecked() {
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/pool/CloseTracking.java b/commons-db/src/main/java/com/palantir/nexus/db/pool/CloseTracking.java
index b66c2f42d7d..123006a0379 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/pool/CloseTracking.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/pool/CloseTracking.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.nexus.db.pool;
 
-import java.sql.Connection;
-import java.util.Arrays;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.FinalizableReferenceQueue;
 import com.google.common.base.FinalizableWeakReference;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.palantir.nexus.db.ResourceCreationLocation;
+import java.sql.Connection;
+import java.util.Arrays;
+import java.util.Set;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CloseTracking {
     private static final Logger log = LoggerFactory.getLogger(CloseTracking.class);
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/pool/ConnectionManager.java b/commons-db/src/main/java/com/palantir/nexus/db/pool/ConnectionManager.java
index d7134fdc3e8..e7aa071c939 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/pool/ConnectionManager.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/pool/ConnectionManager.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.nexus.db.pool;
 
+import com.palantir.nexus.db.DBType;
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import com.palantir.nexus.db.DBType;
-
 /**
  * A SQL connection pool that can be flushed.
  *
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/pool/ReentrantManagedConnectionSupplier.java b/commons-db/src/main/java/com/palantir/nexus/db/pool/ReentrantManagedConnectionSupplier.java
index 1b1b6574d7a..7eaeb8d3b46 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/pool/ReentrantManagedConnectionSupplier.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/pool/ReentrantManagedConnectionSupplier.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.nexus.db.pool;
 
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.annotation.concurrent.ThreadSafe;
-
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.nexus.db.ReentrantConnectionSupplier;
+import java.sql.Connection;
+import java.sql.SQLException;
+import javax.annotation.concurrent.ThreadSafe;
 
 @ThreadSafe
 public class ReentrantManagedConnectionSupplier implements ReentrantConnectionSupplier {
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/pool/ResourceTypes.java b/commons-db/src/main/java/com/palantir/nexus/db/pool/ResourceTypes.java
index 8cd61a32d52..7c18ef0d044 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/pool/ResourceTypes.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/pool/ResourceTypes.java
@@ -15,16 +15,15 @@
  */
 package com.palantir.nexus.db.pool;
 
+import com.google.common.reflect.AbstractInvocationHandler;
+import com.palantir.nexus.db.DBType;
+import com.palantir.proxy.util.ProxyUtils;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import com.google.common.reflect.AbstractInvocationHandler;
-import com.palantir.nexus.db.DBType;
-import com.palantir.proxy.util.ProxyUtils;
-
 public final class ResourceTypes {
     private ResourceTypes() {
         // no
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableTransactions.java b/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableTransactions.java
index b4586835233..4bb87419666 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableTransactions.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableTransactions.java
@@ -15,6 +15,10 @@
  */
 package com.palantir.nexus.db.pool;
 
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.palantir.logsafe.Preconditions;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -22,17 +26,10 @@
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
-
 import javax.annotation.Nullable;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.palantir.logsafe.Preconditions;
-
 public final class RetriableTransactions {
     private static final Logger log = LoggerFactory.getLogger(RetriableTransactions.class);
 
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableWriteTransaction.java b/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableWriteTransaction.java
index d7c2363d7e7..fc62e9a9e90 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableWriteTransaction.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableWriteTransaction.java
@@ -17,7 +17,6 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
-
 import javax.annotation.Nullable;
 
 /**
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/AbstractAgnosticResultRow.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/AbstractAgnosticResultRow.java
index b3247b11be3..bc39dd78bd7 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/AbstractAgnosticResultRow.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/AbstractAgnosticResultRow.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.nexus.db.sql;
 
+import com.palantir.common.base.Throwables;
+import com.palantir.exception.PalantirSqlException;
+import com.palantir.nexus.db.DBType;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.sql.SQLException;
 import java.util.Map;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.common.base.Throwables;
-import com.palantir.exception.PalantirSqlException;
-import com.palantir.nexus.db.DBType;
-
 public abstract class AbstractAgnosticResultRow implements AgnosticResultRow {
 
     private static final Logger log = LoggerFactory.getLogger(AbstractAgnosticResultRow.class);
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultRow.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultRow.java
index fa34bfa49f1..bef604b38ae 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultRow.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultRow.java
@@ -16,12 +16,10 @@
 package com.palantir.nexus.db.sql;
 
 
+import com.palantir.exception.PalantirSqlException;
 import java.io.InputStream;
-
 import org.joda.time.DateTime;
 
-import com.palantir.exception.PalantirSqlException;
-
 public interface AgnosticLightResultRow extends AgnosticResultRow {
 
     InputStream getBinaryInputStream(final String colname) throws PalantirSqlException;
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultRowImpl.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultRowImpl.java
index b19356dc3bf..2fe31869be7 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultRowImpl.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultRowImpl.java
@@ -16,6 +16,11 @@
 package com.palantir.nexus.db.sql;
 
 
+import com.palantir.exception.PalantirSqlException;
+import com.palantir.nexus.db.DBType;
+import com.palantir.sql.Blobs;
+import com.palantir.sql.Clobs;
+import com.palantir.sql.ResultSets;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.sql.Blob;
@@ -23,15 +28,8 @@
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Map;
-
 import org.joda.time.DateTime;
 
-import com.palantir.exception.PalantirSqlException;
-import com.palantir.nexus.db.DBType;
-import com.palantir.sql.Blobs;
-import com.palantir.sql.Clobs;
-import com.palantir.sql.ResultSets;
-
 public class AgnosticLightResultRowImpl extends AbstractAgnosticResultRow implements AgnosticLightResultRow {
     private ResultSet results;
 
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultSet.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultSet.java
index 57723e027b6..88afd5b9a53 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultSet.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultSet.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.nexus.db.sql;
 
+import com.palantir.common.visitor.Visitor;
 import java.io.Closeable;
 import java.util.Iterator;
 
-import com.palantir.common.visitor.Visitor;
-
 /**
  * This result set only loads one row at a time, and thus provides a
  * low-overhead solution for large queries.  Read the comments about the iterator before
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultSetImpl.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultSetImpl.java
index c9fde2df020..15577e84230 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultSetImpl.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultSetImpl.java
@@ -16,16 +16,6 @@
 package com.palantir.nexus.db.sql;
 
 
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.common.base.Throwables;
 import com.palantir.common.visitor.Visitor;
 import com.palantir.exception.PalantirInterruptedException;
@@ -36,6 +26,14 @@
 import com.palantir.nexus.db.sql.BasicSQLString.FinalSQLString;
 import com.palantir.sql.ResultSets;
 import com.palantir.util.AssertUtils;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.Iterator;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This result set only loads one row at a time, and thus provides a
@@ -233,4 +231,3 @@ public void visitAndClose(Visitor visitor) throw
         }
     }
 }
-
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticResultRowImpl.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticResultRowImpl.java
index faf9ed62d74..4f85f69c9f5 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticResultRowImpl.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticResultRowImpl.java
@@ -16,6 +16,10 @@
 package com.palantir.nexus.db.sql;
 
 
+import com.palantir.exception.PalantirSqlException;
+import com.palantir.nexus.db.DBType;
+import com.palantir.sql.Blobs;
+import com.palantir.sql.Clobs;
 import java.math.BigDecimal;
 import java.sql.Blob;
 import java.sql.Clob;
@@ -23,11 +27,6 @@
 import java.util.List;
 import java.util.Map;
 
-import com.palantir.exception.PalantirSqlException;
-import com.palantir.nexus.db.DBType;
-import com.palantir.sql.Blobs;
-import com.palantir.sql.Clobs;
-
 public class AgnosticResultRowImpl extends AbstractAgnosticResultRow {
     private List columns;
 
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticResultSetImpl.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticResultSetImpl.java
index 5aacba4f957..a22e62dfb9f 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticResultSetImpl.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticResultSetImpl.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.nexus.db.sql;
 
-import java.sql.ResultSetMetaData;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.DBType;
 import com.palantir.sql.ResultSets;
+import java.sql.ResultSetMetaData;
+import java.util.List;
+import java.util.Map;
 
 public class AgnosticResultSetImpl implements AgnosticResultSet {
     private final List> results;
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQL.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQL.java
index 7f71154f526..f776b27c1d6 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQL.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQL.java
@@ -15,6 +15,27 @@
  */
 package com.palantir.nexus.db.sql;
 
+import com.google.common.base.Suppliers;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.palantir.common.base.Throwables;
+import com.palantir.common.concurrent.NamedThreadFactory;
+import com.palantir.common.concurrent.PTExecutors;
+import com.palantir.common.concurrent.ThreadNamingCallable;
+import com.palantir.db.oracle.JdbcHandler;
+import com.palantir.db.oracle.JdbcHandler.BlobHandler;
+import com.palantir.exception.PalantirInterruptedException;
+import com.palantir.exception.PalantirSqlException;
+import com.palantir.logsafe.Preconditions;
+import com.palantir.nexus.db.DBType;
+import com.palantir.nexus.db.ResourceCreationLocation;
+import com.palantir.nexus.db.monitoring.timer.SqlTimer;
+import com.palantir.nexus.db.sql.BasicSQLString.FinalSQLString;
+import com.palantir.nexus.db.sql.monitoring.logger.SqlLoggers;
+import com.palantir.sql.Connections;
+import com.palantir.sql.PreparedStatements;
+import com.palantir.sql.ResultSets;
+import com.palantir.util.sql.VerboseSQLException;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -45,35 +66,11 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
-
 import javax.annotation.Nullable;
-
 import org.apache.commons.lang3.Validate;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 
-import com.google.common.base.Suppliers;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.palantir.common.base.Throwables;
-import com.palantir.common.concurrent.NamedThreadFactory;
-import com.palantir.common.concurrent.PTExecutors;
-import com.palantir.common.concurrent.ThreadNamingCallable;
-import com.palantir.db.oracle.JdbcHandler;
-import com.palantir.db.oracle.JdbcHandler.BlobHandler;
-import com.palantir.exception.PalantirInterruptedException;
-import com.palantir.exception.PalantirSqlException;
-import com.palantir.logsafe.Preconditions;
-import com.palantir.nexus.db.DBType;
-import com.palantir.nexus.db.ResourceCreationLocation;
-import com.palantir.nexus.db.monitoring.timer.SqlTimer;
-import com.palantir.nexus.db.sql.BasicSQLString.FinalSQLString;
-import com.palantir.nexus.db.sql.monitoring.logger.SqlLoggers;
-import com.palantir.sql.Connections;
-import com.palantir.sql.PreparedStatements;
-import com.palantir.sql.ResultSets;
-import com.palantir.util.sql.VerboseSQLException;
-
 public abstract class BasicSQL {
 
     public interface SqlConfig {
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQLUtils.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQLUtils.java
index b0c10f988ca..ff62df3e578 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQLUtils.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQLUtils.java
@@ -15,6 +15,12 @@
  */
 package com.palantir.nexus.db.sql;
 
+import com.palantir.common.concurrent.ThreadNamingCallable;
+import com.palantir.exception.PalantirSqlException;
+import com.palantir.nexus.db.DBType;
+import com.palantir.nexus.db.SQLConstants;
+import com.palantir.nexus.db.ThreadConfinedProxy;
+import com.palantir.nexus.db.sql.monitoring.logger.SqlLoggers;
 import java.io.ByteArrayInputStream;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -25,21 +31,12 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
-
 import javax.annotation.Nullable;
-
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.common.concurrent.ThreadNamingCallable;
-import com.palantir.exception.PalantirSqlException;
-import com.palantir.nexus.db.DBType;
-import com.palantir.nexus.db.SQLConstants;
-import com.palantir.nexus.db.ThreadConfinedProxy;
-import com.palantir.nexus.db.sql.monitoring.logger.SqlLoggers;
-
 public class BasicSQLUtils {
 
     /**
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnection.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnection.java
index 85f1b561973..119183150cc 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnection.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnection.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.nexus.db.sql;
 
-import java.sql.Connection;
-
 import com.palantir.exception.PalantirSqlException;
+import java.sql.Connection;
 
 public interface ConnectionBackedSqlConnection extends PalantirSqlConnection {
     public void close() throws PalantirSqlException;
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnectionImpl.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnectionImpl.java
index fde5c004cb7..3c4a081e877 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnectionImpl.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnectionImpl.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.nexus.db.sql;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.util.function.Supplier;
-
 import com.palantir.exception.PalantirInterruptedException;
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.sql.SQLString.RegisteredSQLString;
 import com.palantir.sql.Connections;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.util.function.Supplier;
 
 /**
  * Prefer {@link PalantirSqlConnectionImpl} to this class.
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/SQL.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/SQL.java
index 816e532ca31..8e31d5d25bb 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/SQL.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/SQL.java
@@ -15,20 +15,6 @@
  */
 package com.palantir.nexus.db.sql;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.concurrent.ExecutorService;
-
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Preconditions;
 import com.palantir.common.base.Throwables;
 import com.palantir.db.oracle.JdbcHandler.ArrayHandler;
@@ -43,6 +29,18 @@
 import com.palantir.sql.PreparedStatements;
 import com.palantir.sql.ResultSets;
 import com.palantir.util.streams.PTStreams;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.concurrent.ExecutorService;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Routines for issuing SQL statements to the database.
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/SQLString.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/SQLString.java
index ca8d81ae7a3..8c4ad5d73e5 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/SQLString.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/SQLString.java
@@ -15,6 +15,14 @@
  */
 package com.palantir.nexus.db.sql;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
+import com.palantir.common.exception.PalantirRuntimeException;
+import com.palantir.exception.PalantirSqlException;
+import com.palantir.logsafe.Preconditions;
+import com.palantir.nexus.db.DBType;
+import com.palantir.nexus.db.SqlClause;
 import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -25,20 +33,9 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.regex.Pattern;
-
 import javax.annotation.concurrent.GuardedBy;
-
 import org.apache.commons.lang3.Validate;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
-import com.palantir.common.exception.PalantirRuntimeException;
-import com.palantir.exception.PalantirSqlException;
-import com.palantir.logsafe.Preconditions;
-import com.palantir.nexus.db.DBType;
-import com.palantir.nexus.db.SqlClause;
-
 // class extended by other projects
 @SuppressWarnings("WeakerAccess")
 public class SQLString extends BasicSQLString {
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnection.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnection.java
index f4ac57fe37f..9362ccc7dd6 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnection.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnection.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.nexus.db.sql;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-
 import com.palantir.exception.PalantirInterruptedException;
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.sql.SQLString.RegisteredSQLString;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
 
 public interface SqlConnection {
     void executeUnregisteredQuery(String sql, Object... vs) throws PalantirSqlException;
@@ -62,4 +61,3 @@ public interface SqlConnection {
 
     Connection getUnderlyingConnection() throws PalantirSqlException;
 }
-
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnectionHelper.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnectionHelper.java
index 937fe6eb62a..df11361bf54 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnectionHelper.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnectionHelper.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.nexus.db.sql;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-
-import javax.annotation.Nullable;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.palantir.exception.PalantirInterruptedException;
@@ -29,6 +24,9 @@
 import com.palantir.nexus.db.sql.BasicSQLString.FinalSQLString;
 import com.palantir.nexus.db.sql.SQLString.RegisteredSQLString;
 import com.palantir.sql.PreparedStatements;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import javax.annotation.Nullable;
 
 /**
  * Helper methods for {@link PalantirSqlConnection} implementations. These were originally
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/monitoring/logger/SqlLoggers.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/monitoring/logger/SqlLoggers.java
index 29eb468a7ca..3933254c44d 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/monitoring/logger/SqlLoggers.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/monitoring/logger/SqlLoggers.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.nexus.db.sql.monitoring.logger;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 @SuppressFBWarnings("SLF4J_LOGGER_SHOULD_BE_PRIVATE")
 public class SqlLoggers {
     public static final Logger LOGGER = LoggerFactory.getLogger("com.palantir.nexus.db.SQL");
diff --git a/commons-db/src/main/java/com/palantir/nexus/streaming/PTInputStream.java b/commons-db/src/main/java/com/palantir/nexus/streaming/PTInputStream.java
index 531771c91f1..e9140e1963b 100644
--- a/commons-db/src/main/java/com/palantir/nexus/streaming/PTInputStream.java
+++ b/commons-db/src/main/java/com/palantir/nexus/streaming/PTInputStream.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.nexus.streaming;
 
+import com.palantir.common.io.ForwardingInputStream;
 import java.io.InputStream;
 import java.io.Serializable;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
 
-import com.palantir.common.io.ForwardingInputStream;
-
 public class PTInputStream extends ForwardingInputStream implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/commons-db/src/main/java/com/palantir/sql/Blobs.java b/commons-db/src/main/java/com/palantir/sql/Blobs.java
index b79cace8a61..fb37b9a5b03 100644
--- a/commons-db/src/main/java/com/palantir/sql/Blobs.java
+++ b/commons-db/src/main/java/com/palantir/sql/Blobs.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.sql;
 
-import java.sql.Blob;
-import java.sql.SQLException;
-
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.sql.BasicSQL;
+import java.sql.Blob;
+import java.sql.SQLException;
 
 public class Blobs {
     public static long length(Blob b) throws PalantirSqlException {
diff --git a/commons-db/src/main/java/com/palantir/sql/Clobs.java b/commons-db/src/main/java/com/palantir/sql/Clobs.java
index b72a4039ef8..64dd363b398 100644
--- a/commons-db/src/main/java/com/palantir/sql/Clobs.java
+++ b/commons-db/src/main/java/com/palantir/sql/Clobs.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.sql;
 
-import java.sql.Clob;
-import java.sql.SQLException;
-
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.sql.BasicSQL;
+import java.sql.Clob;
+import java.sql.SQLException;
 
 public class Clobs {
 
diff --git a/commons-db/src/main/java/com/palantir/sql/Connections.java b/commons-db/src/main/java/com/palantir/sql/Connections.java
index efb80a5ef17..d16c99afe29 100644
--- a/commons-db/src/main/java/com/palantir/sql/Connections.java
+++ b/commons-db/src/main/java/com/palantir/sql/Connections.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.sql;
 
+import com.palantir.exception.PalantirSqlException;
+import com.palantir.nexus.db.sql.BasicSQL;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import com.palantir.exception.PalantirSqlException;
-import com.palantir.nexus.db.sql.BasicSQL;
-
 
 public class Connections  {
 
diff --git a/commons-db/src/main/java/com/palantir/sql/PreparedStatements.java b/commons-db/src/main/java/com/palantir/sql/PreparedStatements.java
index 9812caa5157..58461397d60 100644
--- a/commons-db/src/main/java/com/palantir/sql/PreparedStatements.java
+++ b/commons-db/src/main/java/com/palantir/sql/PreparedStatements.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.sql;
 
+import com.palantir.exception.PalantirSqlException;
+import com.palantir.nexus.db.sql.BasicSQL;
 import java.io.InputStream;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 
-import com.palantir.exception.PalantirSqlException;
-import com.palantir.nexus.db.sql.BasicSQL;
-
 public class PreparedStatements {
     public static int getUpdateCount(PreparedStatement ps) throws PalantirSqlException {
         try {
diff --git a/commons-db/src/main/java/com/palantir/sql/ResultSets.java b/commons-db/src/main/java/com/palantir/sql/ResultSets.java
index 1f7a809175f..28c03e3f990 100644
--- a/commons-db/src/main/java/com/palantir/sql/ResultSets.java
+++ b/commons-db/src/main/java/com/palantir/sql/ResultSets.java
@@ -15,6 +15,10 @@
  */
 package com.palantir.sql;
 
+import com.google.common.collect.Maps;
+import com.palantir.exception.PalantirSqlException;
+import com.palantir.nexus.db.DBType;
+import com.palantir.nexus.db.sql.BasicSQL;
 import java.io.ByteArrayInputStream;
 import java.io.FilterInputStream;
 import java.io.IOException;
@@ -26,11 +30,6 @@
 import java.sql.Timestamp;
 import java.util.Map;
 
-import com.google.common.collect.Maps;
-import com.palantir.exception.PalantirSqlException;
-import com.palantir.nexus.db.DBType;
-import com.palantir.nexus.db.sql.BasicSQL;
-
 public class ResultSets {
 
     public static Object getObject(ResultSet rs, int col) throws PalantirSqlException {
diff --git a/commons-db/src/test/java/com/palantir/nexus/db/ThreadConfinedProxyTest.java b/commons-db/src/test/java/com/palantir/nexus/db/ThreadConfinedProxyTest.java
index e3a66aa7f2d..21ba9bbe7c6 100644
--- a/commons-db/src/test/java/com/palantir/nexus/db/ThreadConfinedProxyTest.java
+++ b/commons-db/src/test/java/com/palantir/nexus/db/ThreadConfinedProxyTest.java
@@ -15,6 +15,9 @@
  */
 package com.palantir.nexus.db;
 
+import com.google.common.collect.Iterables;
+import com.palantir.common.proxy.TimingProxy;
+import com.palantir.util.timer.LoggingOperationTimer;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,16 +27,11 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Iterables;
-import com.palantir.common.proxy.TimingProxy;
-import com.palantir.util.timer.LoggingOperationTimer;
-
 public class ThreadConfinedProxyTest extends Assert {
 
     Logger log = LoggerFactory.getLogger(ThreadConfinedProxyTest.class);
@@ -420,4 +418,3 @@ public List subList(int fromIndex, int toIndex) {
 
     }
 }
-
diff --git a/commons-db/src/test/java/com/palantir/nexus/db/sql/BasicSQLTest.java b/commons-db/src/test/java/com/palantir/nexus/db/sql/BasicSQLTest.java
index 0bde7f08b48..18382d711e5 100644
--- a/commons-db/src/test/java/com/palantir/nexus/db/sql/BasicSQLTest.java
+++ b/commons-db/src/test/java/com/palantir/nexus/db/sql/BasicSQLTest.java
@@ -21,18 +21,16 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.palantir.nexus.db.monitoring.timer.DurationSqlTimer;
+import com.palantir.nexus.db.monitoring.timer.SqlTimer;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
-
 import org.junit.Test;
 
-import com.palantir.nexus.db.monitoring.timer.DurationSqlTimer;
-import com.palantir.nexus.db.monitoring.timer.SqlTimer;
-
 @SuppressWarnings("unchecked") // mocked executors
 public class BasicSQLTest {
     @Test
diff --git a/commons-db/src/test/java/com/palantir/nexus/db/sql/SQLStringTest.java b/commons-db/src/test/java/com/palantir/nexus/db/sql/SQLStringTest.java
index 22f0d031108..f2d09330ff2 100644
--- a/commons-db/src/test/java/com/palantir/nexus/db/sql/SQLStringTest.java
+++ b/commons-db/src/test/java/com/palantir/nexus/db/sql/SQLStringTest.java
@@ -17,12 +17,10 @@
 
 import static org.junit.Assert.assertEquals;
 
+import com.google.common.collect.ImmutableList;
 import java.util.List;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-
 public class SQLStringTest {
     @Test
     public void testCanonicalizeString() {
diff --git a/commons-executors/src/main/java/com/palantir/common/concurrent/PTExecutors.java b/commons-executors/src/main/java/com/palantir/common/concurrent/PTExecutors.java
index 40d8908086f..a8da2343c5c 100644
--- a/commons-executors/src/main/java/com/palantir/common/concurrent/PTExecutors.java
+++ b/commons-executors/src/main/java/com/palantir/common/concurrent/PTExecutors.java
@@ -15,6 +15,12 @@
  */
 package com.palantir.common.concurrent;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.CharMatcher;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
+import com.google.common.util.concurrent.Runnables;
+import com.palantir.tracing.Tracers;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -36,17 +42,9 @@
 import java.util.concurrent.ThreadPoolExecutor.AbortPolicy;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.CharMatcher;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
-import com.google.common.util.concurrent.Runnables;
-import com.palantir.tracing.Tracers;
-
 /**
  * Please always use the static methods in this class instead of the ones in {@link
  * Executors}, because the executors returned by these methods will propagate
diff --git a/commons-executors/src/test/java/com/palantir/common/concurrent/ExecutorInheritableThreadLocalTest.java b/commons-executors/src/test/java/com/palantir/common/concurrent/ExecutorInheritableThreadLocalTest.java
index 2a44a1c8fed..5119ee153a0 100644
--- a/commons-executors/src/test/java/com/palantir/common/concurrent/ExecutorInheritableThreadLocalTest.java
+++ b/commons-executors/src/test/java/com/palantir/common/concurrent/ExecutorInheritableThreadLocalTest.java
@@ -16,24 +16,22 @@
 package com.palantir.common.concurrent;
 
 
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.Callables;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.util.concurrent.Callables;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-
 public class ExecutorInheritableThreadLocalTest extends Assert {
     private static final String orig = "Yo";
     private static List outputList = Lists.newLinkedList();
@@ -122,6 +120,7 @@ public void testNullable() {
         assertNull(local.get());
     }
 
+    @SuppressWarnings("CheckReturnValue")
     @Test
     public void testSameThread() {
         local.set("whatup");
diff --git a/commons-executors/src/test/java/com/palantir/common/concurrent/PTExecutorsTest.java b/commons-executors/src/test/java/com/palantir/common/concurrent/PTExecutorsTest.java
index c1acaa9d55c..998a5c9c419 100644
--- a/commons-executors/src/test/java/com/palantir/common/concurrent/PTExecutorsTest.java
+++ b/commons-executors/src/test/java/com/palantir/common/concurrent/PTExecutorsTest.java
@@ -20,7 +20,6 @@
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
-
 import org.junit.Test;
 
 @SuppressWarnings("checkstyle:AbbreviationAsWordInName") // Name matches the class we're testing
diff --git a/commons-proxy/src/main/java/com/palantir/proxy/exception/ProxyException.java b/commons-proxy/src/main/java/com/palantir/proxy/exception/ProxyException.java
index 57da260d808..e5754443d88 100644
--- a/commons-proxy/src/main/java/com/palantir/proxy/exception/ProxyException.java
+++ b/commons-proxy/src/main/java/com/palantir/proxy/exception/ProxyException.java
@@ -30,4 +30,3 @@ public ProxyException(String message, Throwable cause) {
         super(message, cause);
     }
 }
-
diff --git a/commons-proxy/src/main/java/com/palantir/proxy/util/ProxyUtils.java b/commons-proxy/src/main/java/com/palantir/proxy/util/ProxyUtils.java
index 89fe0015616..bafa580c306 100644
--- a/commons-proxy/src/main/java/com/palantir/proxy/util/ProxyUtils.java
+++ b/commons-proxy/src/main/java/com/palantir/proxy/util/ProxyUtils.java
@@ -15,6 +15,7 @@
  */
 package com.palantir.proxy.util;
 
+import com.palantir.proxy.exception.ProxyException;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -25,8 +26,6 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import com.palantir.proxy.exception.ProxyException;
-
 public final class ProxyUtils {
     private ProxyUtils() {
         // Utility class, should never be instantiated
diff --git a/examples/profile-client/src/main/java/com/palantir/example/profile/ProfileStore.java b/examples/profile-client/src/main/java/com/palantir/example/profile/ProfileStore.java
index 4d3f314fe20..12d875cbb49 100644
--- a/examples/profile-client/src/main/java/com/palantir/example/profile/ProfileStore.java
+++ b/examples/profile-client/src/main/java/com/palantir/example/profile/ProfileStore.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.example.profile;
 
-import java.io.InputStream;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.palantir.atlasdb.ptobject.EncodingUtils;
@@ -37,6 +31,11 @@
 import com.palantir.example.profile.schema.generated.UserProfileTable.UserBirthdaysIdxTable.UserBirthdaysIdxRow;
 import com.palantir.example.profile.schema.generated.UserProfileTable.UserProfileRow;
 import com.palantir.util.crypto.Sha256Hash;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 
 public class ProfileStore {
     final TransactionManager txnMgr;
diff --git a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/ProfileSchema.java b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/ProfileSchema.java
index 2a753e171c3..e6b8a8f3b9e 100644
--- a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/ProfileSchema.java
+++ b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/ProfileSchema.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.example.profile.schema;
 
-import java.io.File;
-import java.util.List;
-
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
@@ -33,6 +30,8 @@
 import com.palantir.atlasdb.table.description.TableDefinition;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.example.profile.protos.generated.ProfilePersistence;
+import java.io.File;
+import java.util.List;
 
 @SuppressWarnings({"checkstyle:Indentation", "checkstyle:RightCurly"})
 public class ProfileSchema implements AtlasSchema {
diff --git a/examples/profile-client/src/test/java/com/palantir/example/profile/CookiesIdxColumnTest.java b/examples/profile-client/src/test/java/com/palantir/example/profile/CookiesIdxColumnTest.java
index e161ec6e1f5..6f374e8b03c 100644
--- a/examples/profile-client/src/test/java/com/palantir/example/profile/CookiesIdxColumnTest.java
+++ b/examples/profile-client/src/test/java/com/palantir/example/profile/CookiesIdxColumnTest.java
@@ -15,13 +15,11 @@
  */
 package com.palantir.example.profile;
 
+import com.palantir.example.profile.schema.generated.UserProfileTable.CookiesIdxTable.CookiesIdxColumn;
 import java.util.UUID;
-
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.palantir.example.profile.schema.generated.UserProfileTable.CookiesIdxTable.CookiesIdxColumn;
-
 public class CookiesIdxColumnTest {
     @Test
     public void testHashCode() {
diff --git a/examples/profile-client/src/test/java/com/palantir/example/profile/ProfileStoreTest.java b/examples/profile-client/src/test/java/com/palantir/example/profile/ProfileStoreTest.java
index 7fc879db9ea..01419dd46bf 100644
--- a/examples/profile-client/src/test/java/com/palantir/example/profile/ProfileStoreTest.java
+++ b/examples/profile-client/src/test/java/com/palantir/example/profile/ProfileStoreTest.java
@@ -18,19 +18,6 @@
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Set;
-import java.util.UUID;
-import java.util.function.Function;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.Closeables;
 import com.palantir.atlasdb.factory.TransactionManagers;
@@ -43,6 +30,17 @@
 import com.palantir.example.profile.schema.generated.ProfileTableFactory;
 import com.palantir.example.profile.schema.generated.UserPhotosStreamValueTable;
 import com.palantir.util.crypto.Sha256Hash;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Set;
+import java.util.UUID;
+import java.util.function.Function;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 public class ProfileStoreTest {
     private static final byte[] IMAGE = new byte[] {0, 1, 2, 3};
diff --git a/flake-rule/src/main/java/com/palantir/flake/FlakeRetryingRule.java b/flake-rule/src/main/java/com/palantir/flake/FlakeRetryingRule.java
index 5bc5b526c52..d11a4de80e0 100644
--- a/flake-rule/src/main/java/com/palantir/flake/FlakeRetryingRule.java
+++ b/flake-rule/src/main/java/com/palantir/flake/FlakeRetryingRule.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.flake;
 
+import com.google.common.base.Preconditions;
+import com.google.common.base.Throwables;
 import java.util.Arrays;
 import java.util.Optional;
-
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
-
 /**
  * A {@link TestRule} that retries methods and classes annotated with the {@link ShouldRetry} annotation.
  *
diff --git a/flake-rule/src/test/java/com/palantir/flake/BeforeClassFlakeTest.java b/flake-rule/src/test/java/com/palantir/flake/BeforeClassFlakeTest.java
index 043b2d204b1..37d1a7db38f 100644
--- a/flake-rule/src/test/java/com/palantir/flake/BeforeClassFlakeTest.java
+++ b/flake-rule/src/test/java/com/palantir/flake/BeforeClassFlakeTest.java
@@ -18,7 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.concurrent.atomic.AtomicBoolean;
-
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
diff --git a/flake-rule/src/test/java/com/palantir/flake/FlakeRetryingRuleClassAnnotationTest.java b/flake-rule/src/test/java/com/palantir/flake/FlakeRetryingRuleClassAnnotationTest.java
index 6a7ee38dcae..0596d4b0e6c 100644
--- a/flake-rule/src/test/java/com/palantir/flake/FlakeRetryingRuleClassAnnotationTest.java
+++ b/flake-rule/src/test/java/com/palantir/flake/FlakeRetryingRuleClassAnnotationTest.java
@@ -17,15 +17,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.Maps;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
 
-import com.google.common.collect.Maps;
-
 @ShouldRetry(numAttempts = 2)
 public class FlakeRetryingRuleClassAnnotationTest {
     private static final Map counters = Maps.newHashMap();
diff --git a/flake-rule/src/test/java/com/palantir/flake/FlakeRetryingRuleTest.java b/flake-rule/src/test/java/com/palantir/flake/FlakeRetryingRuleTest.java
index d3f35e178be..e971dd75d8e 100644
--- a/flake-rule/src/test/java/com/palantir/flake/FlakeRetryingRuleTest.java
+++ b/flake-rule/src/test/java/com/palantir/flake/FlakeRetryingRuleTest.java
@@ -17,18 +17,16 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.Maps;
+import com.palantir.flake.fail.ExpectedFailure;
+import com.palantir.flake.fail.ExpectedFailureRule;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestName;
 
-import com.google.common.collect.Maps;
-import com.palantir.flake.fail.ExpectedFailure;
-import com.palantir.flake.fail.ExpectedFailureRule;
-
 public class FlakeRetryingRuleTest {
     private static final Map counters = Maps.newHashMap();
 
diff --git a/flake-rule/src/test/java/com/palantir/flake/example/BeforeAndAfterTest.java b/flake-rule/src/test/java/com/palantir/flake/example/BeforeAndAfterTest.java
index 8176a6bdef2..dd62b746347 100644
--- a/flake-rule/src/test/java/com/palantir/flake/example/BeforeAndAfterTest.java
+++ b/flake-rule/src/test/java/com/palantir/flake/example/BeforeAndAfterTest.java
@@ -21,8 +21,9 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import com.palantir.flake.FlakeRetryingRule;
+import com.palantir.flake.ShouldRetry;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -31,9 +32,6 @@
 import org.junit.Test;
 import org.junit.rules.TestRule;
 
-import com.palantir.flake.FlakeRetryingRule;
-import com.palantir.flake.ShouldRetry;
-
 public class BeforeAndAfterTest {
     private static final AtomicInteger attemptCount = new AtomicInteger();
     private static final int SEVENTY_SEVEN = 77;
diff --git a/flake-rule/src/test/java/com/palantir/flake/example/StringSupplierTest.java b/flake-rule/src/test/java/com/palantir/flake/example/StringSupplierTest.java
index 266b4496a9e..d2c26de3fff 100644
--- a/flake-rule/src/test/java/com/palantir/flake/example/StringSupplierTest.java
+++ b/flake-rule/src/test/java/com/palantir/flake/example/StringSupplierTest.java
@@ -17,15 +17,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.palantir.flake.FlakeRetryingRule;
+import com.palantir.flake.ShouldRetry;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Supplier;
-
 import org.junit.Rule;
 import org.junit.Test;
 
-import com.palantir.flake.FlakeRetryingRule;
-import com.palantir.flake.ShouldRetry;
-
 public class StringSupplierTest {
     private static final String TEST_STRING = "123";
     private static final String EMPTY_STRING = "";
diff --git a/gradle/baseline.gradle b/gradle/baseline.gradle
index 3e3e02c63dd..37f7e0671a0 100644
--- a/gradle/baseline.gradle
+++ b/gradle/baseline.gradle
@@ -1,28 +1,26 @@
 apply plugin: 'com.palantir.baseline-checkstyle'
 
 // ./gradlew compileJava compileTestJava -PenableErrorProne=true
-if (enableErrorProne.toBoolean()) {
-        // installs the "processor" configuration needed for baseline-error-prone
-    apply plugin: 'com.palantir.baseline-error-prone'
-
-    plugins.withId('com.palantir.baseline-error-prone', {
+plugins.withId('com.palantir.baseline-error-prone') {
+    plugins.withId('java') {
         dependencies {
             compileOnly 'com.google.code.findbugs:jsr305'
         }
 
         tasks.withType(JavaCompile).configureEach {
+            options.errorprone.enabled = enableErrorProne.toBoolean()
             options.errorprone.errorproneArgs += [
-                '-XepDisableWarningsInGeneratedCode',
-                '-XepExcludedPaths:.*(generated|Immutable).*',
+                    '-XepDisableWarningsInGeneratedCode',
+                    '-XepExcludedPaths:.*(generated|Immutable).*',
             ]
         }
 
         compileJava {
             options.errorprone.errorproneArgs += [
-                '-Xep:PreconditionsConstantMessage:OFF',
-                '-Xep:ValidateConstantMessage:OFF',
-                // I'd like to change this, but preserving log message format for now
-                '-Xep:CatchBlockLogException:OFF',
+                    '-Xep:PreconditionsConstantMessage:OFF',
+                    '-Xep:ValidateConstantMessage:OFF',
+                    // I'd like to change this, but preserving log message format for now
+                    '-Xep:CatchBlockLogException:OFF',
             ]
         }
 
@@ -30,12 +28,12 @@ if (enableErrorProne.toBoolean()) {
             // CheckReturnValue can be problematic for tests asserting that various Immutable objects may or may not
             // be created.
             options.errorprone.errorproneArgs += [
-                '-Xep:CheckReturnValue:OFF',
-                // ReturnValueIgnored can be problematic for tests asserting a call to some method throws an exception.
-                '-Xep:ReturnValueIgnored:OFF',
+                    '-Xep:CheckReturnValue:OFF',
+                    // ReturnValueIgnored can be problematic for tests asserting a call to some method throws an exception.
+                    '-Xep:ReturnValueIgnored:OFF',
             ]
         }
-    })
+    }
 }
 
 apply plugin: 'com.palantir.baseline-eclipse'
diff --git a/gradle/idea.gradle b/gradle/idea.gradle
index 682108a93f2..7777a0c3a73 100644
--- a/gradle/idea.gradle
+++ b/gradle/idea.gradle
@@ -81,17 +81,7 @@ if (project == rootProject) {
                     .get('component', name: 'ProjectCodeStyleSettingsManager')
                     .get('option', name: 'USE_PER_PROJECT_SETTINGS')
                     .set('value': 'true')
-            def importsTable = Xml.from(provider)
-                    .get('component', name: 'ProjectCodeStyleSettingsManager')
-                    .get('option', name: 'PER_PROJECT_SETTINGS').get('value')
-                    .get('option', name: 'IMPORT_LAYOUT_TABLE').get('value')
-            importsTable.node.children().clear()
-            ['true', 'false'].each { static1 ->
-                ['java', 'javax', 'org', 'com', ''].each { name ->
-                    importsTable.node.appendNode('package', [name: name, withSubpackages: 'true', static: static1])
-                    importsTable.node.appendNode('emptyLine')
-                }
-            }
+
             Xml.from(provider)
                     .get('component', name: 'ProjectCodeStyleSettingsManager')
                     .get('option', name: 'PER_PROJECT_SETTINGS').get('value')
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/BooleanPaxosResponse.java b/leader-election-api/src/main/java/com/palantir/paxos/BooleanPaxosResponse.java
index c0322271ca3..85bc9b274fd 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/BooleanPaxosResponse.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/BooleanPaxosResponse.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.paxos;
 
-import java.util.Objects;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.palantir.common.annotation.Immutable;
+import java.util.Objects;
 
 @Immutable
 public class BooleanPaxosResponse implements PaxosResponse {
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/PaxosLearner.java b/leader-election-api/src/main/java/com/palantir/paxos/PaxosLearner.java
index 7e757e0adde..2e7b9ba7a6a 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/PaxosLearner.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/PaxosLearner.java
@@ -15,8 +15,8 @@
  */
 package com.palantir.paxos;
 
+import com.palantir.common.annotation.Inclusive;
 import java.util.Collection;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.ws.rs.Consumes;
@@ -27,8 +27,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.common.annotation.Inclusive;
-
 @Path("/learner")
 public interface PaxosLearner {
 
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/PaxosPromise.java b/leader-election-api/src/main/java/com/palantir/paxos/PaxosPromise.java
index 282b14c2d72..5b50161af33 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/PaxosPromise.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/PaxosPromise.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.paxos;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang3.builder.CompareToBuilder;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.palantir.common.annotation.Immutable;
 import com.palantir.logsafe.Preconditions;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.apache.commons.lang3.builder.CompareToBuilder;
 
 /**
  * A promise to not accept new proposals less than promisedID.
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/PaxosPromises.java b/leader-election-api/src/main/java/com/palantir/paxos/PaxosPromises.java
index 5c8e4386441..239b82bf38f 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/PaxosPromises.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/PaxosPromises.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.paxos;
 
-import javax.annotation.Nullable;
-
 import com.palantir.paxos.persistence.generated.remoting.PaxosAcceptorPersistence.PaxosPromiseProto;
 import com.palantir.paxos.persistence.generated.remoting.PaxosAcceptorPersistence.PaxosPromiseProto.Builder;
+import javax.annotation.Nullable;
 
 public final class PaxosPromises {
     private PaxosPromises() {
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposal.java b/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposal.java
index e386b81572f..4e83c514461 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposal.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposal.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.paxos;
 
-import java.io.Serializable;
-
-import javax.annotation.Nonnull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.palantir.common.annotation.Immutable;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.paxos.persistence.generated.remoting.PaxosAcceptorPersistence;
+import java.io.Serializable;
+import javax.annotation.Nonnull;
 
 /**
  * A proposal of a value that needs quorum support.
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposalId.java b/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposalId.java
index 37f5592e71b..c951e76b5d2 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposalId.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposalId.java
@@ -15,16 +15,13 @@
  */
 package com.palantir.paxos;
 
-import java.io.Serializable;
-
-import javax.annotation.Nonnull;
-
-import org.apache.commons.lang3.builder.CompareToBuilder;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.palantir.common.annotation.Immutable;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.paxos.persistence.generated.PaxosPersistence;
+import java.io.Serializable;
+import javax.annotation.Nonnull;
+import org.apache.commons.lang3.builder.CompareToBuilder;
 
 /**
  * Proposal identifiers that establish a strict ordering.
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/PaxosResponse.java b/leader-election-api/src/main/java/com/palantir/paxos/PaxosResponse.java
index 88729ff8dfd..e91ff829c46 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/PaxosResponse.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/PaxosResponse.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.paxos;
 
-import java.io.Serializable;
-
 import com.palantir.common.annotation.Immutable;
+import java.io.Serializable;
 
 @Immutable
 public interface PaxosResponse extends Serializable {
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/PaxosStateLog.java b/leader-election-api/src/main/java/com/palantir/paxos/PaxosStateLog.java
index 8409a14b08e..a655943e073 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/PaxosStateLog.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/PaxosStateLog.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.paxos;
 
-import java.io.IOException;
-
 import com.palantir.common.persist.Persistable;
+import java.io.IOException;
 
 public interface PaxosStateLog {
 
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/PaxosValue.java b/leader-election-api/src/main/java/com/palantir/paxos/PaxosValue.java
index 2e65f90593e..c0599451098 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/PaxosValue.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/PaxosValue.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.paxos;
 
-import java.io.Serializable;
-import java.util.Arrays;
-
-import javax.annotation.Nullable;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Defaults;
@@ -31,6 +26,9 @@
 import com.palantir.common.persist.Persistable;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.paxos.persistence.generated.PaxosPersistence;
+import java.io.Serializable;
+import java.util.Arrays;
+import javax.annotation.Nullable;
 
 @Immutable
 public class PaxosValue implements Persistable, Versionable, Serializable {
diff --git a/leader-election-impl/src/main/java/com/palantir/leader/AsyncLeadershipObserver.java b/leader-election-impl/src/main/java/com/palantir/leader/AsyncLeadershipObserver.java
index fbf0ceac343..b7eb8cc9b3c 100644
--- a/leader-election-impl/src/main/java/com/palantir/leader/AsyncLeadershipObserver.java
+++ b/leader-election-impl/src/main/java/com/palantir/leader/AsyncLeadershipObserver.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.leader;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.palantir.common.concurrent.PTExecutors;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutorService;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.palantir.common.concurrent.PTExecutors;
-
 public class AsyncLeadershipObserver implements LeadershipObserver {
 
     private final ExecutorService executorService;
diff --git a/leader-election-impl/src/main/java/com/palantir/leader/BatchingLeaderElectionService.java b/leader-election-impl/src/main/java/com/palantir/leader/BatchingLeaderElectionService.java
index 2e40495351b..1ab6cec1813 100644
--- a/leader-election-impl/src/main/java/com/palantir/leader/BatchingLeaderElectionService.java
+++ b/leader-election-impl/src/main/java/com/palantir/leader/BatchingLeaderElectionService.java
@@ -16,15 +16,14 @@
 
 package com.palantir.leader;
 
+import com.palantir.atlasdb.autobatch.Autobatchers;
+import com.palantir.atlasdb.autobatch.BatchElement;
+import com.palantir.atlasdb.autobatch.DisruptorAutobatcher;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 
-import com.palantir.atlasdb.autobatch.Autobatchers;
-import com.palantir.atlasdb.autobatch.BatchElement;
-import com.palantir.atlasdb.autobatch.DisruptorAutobatcher;
-
 public class BatchingLeaderElectionService implements LeaderElectionService {
     private final LeaderElectionService delegate;
     private final DisruptorAutobatcher batcher;
diff --git a/leader-election-impl/src/main/java/com/palantir/leader/LeadershipEvents.java b/leader-election-impl/src/main/java/com/palantir/leader/LeadershipEvents.java
index 2de87888e72..7bb2ff33af2 100644
--- a/leader-election-impl/src/main/java/com/palantir/leader/LeadershipEvents.java
+++ b/leader-election-impl/src/main/java/com/palantir/leader/LeadershipEvents.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.leader;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.paxos.PaxosRoundFailureException;
 import com.palantir.paxos.PaxosValue;
-
 import net.jcip.annotations.ThreadSafe;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @ThreadSafe
 class LeadershipEvents {
diff --git a/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeaderElectionService.java b/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeaderElectionService.java
index 4363d4a765f..accfbaf3998 100644
--- a/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeaderElectionService.java
+++ b/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeaderElectionService.java
@@ -15,17 +15,6 @@
  */
 package com.palantir.leader;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.immutables.value.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -43,6 +32,15 @@
 import com.palantir.paxos.PaxosRoundFailureException;
 import com.palantir.paxos.PaxosUpdate;
 import com.palantir.paxos.PaxosValue;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.ReentrantLock;
+import org.immutables.value.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Implementation of a paxos member than can be a designated proposer (leader) and designated
@@ -306,7 +304,7 @@ public boolean stepDown() {
             } catch (PaxosRoundFailureException e) {
                 log.info("Couldn't relinquish leadership because a quorum could not be obtained. Last observed"
                         + " state was {}.",
-                        SafeArg.of("leadershipState", leadershipState));
+                        SafeArg.of("leadershipState", leadershipState), e);
                 throw new ServiceNotAvailableException("Couldn't relinquish leadership", e);
             }
         }
diff --git a/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeaderElectionServiceBuilder.java b/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeaderElectionServiceBuilder.java
index 67f02af157d..9e23511d4cf 100644
--- a/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeaderElectionServiceBuilder.java
+++ b/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeaderElectionServiceBuilder.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.leader;
 
-import java.time.Duration;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import com.google.common.net.HostAndPort;
@@ -39,6 +29,15 @@
 import com.palantir.paxos.SingleLeaderAcceptorNetworkClient;
 import com.palantir.paxos.SingleLeaderLearnerNetworkClient;
 import com.palantir.paxos.SingleLeaderPinger;
+import java.time.Duration;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 @SuppressWarnings("HiddenField")
 public class PaxosLeaderElectionServiceBuilder {
diff --git a/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeadershipEventRecorder.java b/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeadershipEventRecorder.java
index 5036d44f985..1f9dfde8720 100644
--- a/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeadershipEventRecorder.java
+++ b/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeadershipEventRecorder.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.leader;
 
-import java.util.Optional;
-
-import javax.annotation.concurrent.GuardedBy;
-
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.paxos.PaxosRoundFailureException;
 import com.palantir.paxos.PaxosValue;
+import java.util.Optional;
+import javax.annotation.concurrent.GuardedBy;
 
 public class PaxosLeadershipEventRecorder implements PaxosKnowledgeEventRecorder, PaxosLeaderElectionEventRecorder {
 
diff --git a/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeadershipToken.java b/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeadershipToken.java
index 0b0c43c90d6..bc8a459e89e 100644
--- a/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeadershipToken.java
+++ b/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeadershipToken.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.leader;
 
-import org.apache.commons.lang3.builder.CompareToBuilder;
-
 import com.palantir.common.annotation.Immutable;
 import com.palantir.leader.LeaderElectionService.LeadershipToken;
 import com.palantir.paxos.PaxosValue;
+import org.apache.commons.lang3.builder.CompareToBuilder;
 
 @Immutable
 public class PaxosLeadershipToken implements LeadershipToken {
diff --git a/leader-election-impl/src/main/java/com/palantir/leader/proxy/AwaitingLeadershipProxy.java b/leader-election-impl/src/main/java/com/palantir/leader/proxy/AwaitingLeadershipProxy.java
index 52f40984105..f47b1062db4 100644
--- a/leader-election-impl/src/main/java/com/palantir/leader/proxy/AwaitingLeadershipProxy.java
+++ b/leader-election-impl/src/main/java/com/palantir/leader/proxy/AwaitingLeadershipProxy.java
@@ -15,6 +15,17 @@
  */
 package com.palantir.leader.proxy;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.reflect.AbstractInvocationHandler;
+import com.palantir.common.concurrent.PTExecutors;
+import com.palantir.common.remoting.ServiceNotAvailableException;
+import com.palantir.leader.LeaderElectionService;
+import com.palantir.leader.LeaderElectionService.LeadershipToken;
+import com.palantir.leader.LeaderElectionService.StillLeadingStatus;
+import com.palantir.leader.NotCurrentLeaderException;
+import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import java.io.Closeable;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -26,24 +37,10 @@
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
-
 import javax.annotation.Nullable;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.reflect.AbstractInvocationHandler;
-import com.palantir.common.concurrent.PTExecutors;
-import com.palantir.common.remoting.ServiceNotAvailableException;
-import com.palantir.leader.LeaderElectionService;
-import com.palantir.leader.LeaderElectionService.LeadershipToken;
-import com.palantir.leader.LeaderElectionService.StillLeadingStatus;
-import com.palantir.leader.NotCurrentLeaderException;
-import com.palantir.logsafe.SafeArg;
-import com.palantir.logsafe.exceptions.SafeIllegalStateException;
-
 public final class AwaitingLeadershipProxy extends AbstractInvocationHandler {
 
     private static final Logger log = LoggerFactory.getLogger(AwaitingLeadershipProxy.class);
@@ -119,7 +116,7 @@ private void gainLeadershipWithRetry() {
                 Thread.sleep(GAIN_LEADERSHIP_BACKOFF.toMillis());
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
-                log.warn("gain leadership backoff interrupted");
+                log.warn("gain leadership backoff interrupted", e);
             }
         }
     }
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/InProgressResponseState.java b/leader-election-impl/src/main/java/com/palantir/paxos/InProgressResponseState.java
index 267e524ca9f..3111740ffff 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/InProgressResponseState.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/InProgressResponseState.java
@@ -17,7 +17,6 @@
 package com.palantir.paxos;
 
 import java.util.Map;
-
 import org.immutables.value.Value;
 
 @Value.Immutable
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosAcceptorImpl.java b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosAcceptorImpl.java
index 0d15e5919a5..6d4a1f967ec 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosAcceptorImpl.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosAcceptorImpl.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.paxos;
 
+import com.palantir.logsafe.SafeArg;
 import java.io.IOException;
 import java.util.concurrent.ConcurrentSkipListMap;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.logsafe.SafeArg;
-
 public final class PaxosAcceptorImpl implements PaxosAcceptor {
     private static final Logger logger = LoggerFactory.getLogger(PaxosAcceptorImpl.class);
 
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosLearnerImpl.java b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosLearnerImpl.java
index e14c1c04f08..1181112fe6d 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosLearnerImpl.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosLearnerImpl.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.paxos;
 
+import com.palantir.leader.PaxosKnowledgeEventRecorder;
+import com.palantir.logsafe.SafeArg;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.SortedMap;
 import java.util.concurrent.ConcurrentSkipListMap;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.leader.PaxosKnowledgeEventRecorder;
-import com.palantir.logsafe.SafeArg;
-
 public final class PaxosLearnerImpl implements PaxosLearner {
 
     private static final Logger logger = LoggerFactory.getLogger(PaxosLearnerImpl.class);
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosProposerImpl.java b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosProposerImpl.java
index 60361b5e605..abc15e76525 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosProposerImpl.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosProposerImpl.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.paxos;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
-
 import javax.annotation.Nullable;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
 /**
  * Implementation of a paxos proposer than can be a designated proposer (leader) and designated
  * learner (informer).
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosQuorumChecker.java b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosQuorumChecker.java
index 0ba0ffe2592..8fb415ff5db 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosQuorumChecker.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosQuorumChecker.java
@@ -15,6 +15,15 @@
  */
 package com.palantir.paxos;
 
+import com.codahale.metrics.Meter;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.palantir.common.concurrent.MultiplexingCompletionService;
+import com.palantir.common.concurrent.NamedThreadFactory;
+import com.palantir.common.concurrent.PTExecutors;
+import com.palantir.logsafe.Preconditions;
+import com.palantir.logsafe.SafeArg;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.List;
@@ -28,20 +37,9 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.codahale.metrics.Meter;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import com.palantir.common.concurrent.MultiplexingCompletionService;
-import com.palantir.common.concurrent.NamedThreadFactory;
-import com.palantir.common.concurrent.PTExecutors;
-import com.palantir.logsafe.Preconditions;
-import com.palantir.logsafe.SafeArg;
-
 @SuppressWarnings("MethodTypeParameterName")
 public final class PaxosQuorumChecker {
 
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponseAccumulator.java b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponseAccumulator.java
index 8ac39e7e32e..81f9535ebba 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponseAccumulator.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponseAccumulator.java
@@ -16,14 +16,12 @@
 
 package com.palantir.paxos;
 
+import com.palantir.logsafe.Preconditions;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.Predicate;
-
 import javax.annotation.concurrent.NotThreadSafe;
 
-import com.palantir.logsafe.Preconditions;
-
 @NotThreadSafe
 final class PaxosResponseAccumulator {
 
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponses.java b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponses.java
index f522cd1ff4d..a08a254523e 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponses.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponses.java
@@ -20,7 +20,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.immutables.value.Value;
 
 @Value.Immutable
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponsesWithRemote.java b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponsesWithRemote.java
index a41ec324ffa..46bc581bbad 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponsesWithRemote.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponsesWithRemote.java
@@ -16,14 +16,12 @@
 
 package com.palantir.paxos;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.common.streams.KeyedStream;
 import java.util.Map;
 import java.util.function.Function;
-
 import org.immutables.value.Value;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.common.streams.KeyedStream;
-
 @Value.Immutable
 public abstract class PaxosResponsesWithRemote {
 
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosStateLogImpl.java b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosStateLogImpl.java
index e796ad25194..882520376a8 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosStateLogImpl.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosStateLogImpl.java
@@ -15,6 +15,19 @@
  */
 package com.palantir.paxos;
 
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.CodedInputStream;
+import com.google.protobuf.CodedOutputStream;
+import com.palantir.common.base.Throwables;
+import com.palantir.common.persist.Persistable;
+import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.UnsafeArg;
+import com.palantir.paxos.persistence.generated.PaxosPersistence;
+import com.palantir.util.crypto.Sha256Hash;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -28,26 +41,11 @@
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.concurrent.locks.ReentrantLock;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Predicate;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.CodedInputStream;
-import com.google.protobuf.CodedOutputStream;
-import com.palantir.common.base.Throwables;
-import com.palantir.common.persist.Persistable;
-import com.palantir.logsafe.SafeArg;
-import com.palantir.logsafe.UnsafeArg;
-import com.palantir.paxos.persistence.generated.PaxosPersistence;
-import com.palantir.util.crypto.Sha256Hash;
-
 public class PaxosStateLogImpl implements PaxosStateLog {
 
     private final ReentrantLock lock = new ReentrantLock();
@@ -267,7 +265,7 @@ private byte[] getBytesAndCheckChecksum(File file) throws IOException {
                 // Note that the file name is a Paxos log entry - so it is the round number - and thus safe.
                 log.error("Problem reading paxos state, specifically when reading file {} (file-name {})",
                         UnsafeArg.of("full path", file.getAbsolutePath()),
-                        SafeArg.of("file name", file.getName()));
+                        SafeArg.of("file name", file.getName()), e);
                 throw Throwables.rewrap(e);
             } finally {
                 IOUtils.closeQuietly(fileIn);
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderAcceptorNetworkClient.java b/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderAcceptorNetworkClient.java
index fe257e00b3a..4421f4dcacd 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderAcceptorNetworkClient.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderAcceptorNetworkClient.java
@@ -16,12 +16,11 @@
 
 package com.palantir.paxos;
 
+import com.google.common.collect.ImmutableList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 
-import com.google.common.collect.ImmutableList;
-
 public class SingleLeaderAcceptorNetworkClient implements PaxosAcceptorNetworkClient {
 
     private final ImmutableList acceptors;
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderLearnerNetworkClient.java b/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderLearnerNetworkClient.java
index 040af37f424..f468e892bb6 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderLearnerNetworkClient.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderLearnerNetworkClient.java
@@ -16,20 +16,18 @@
 
 package com.palantir.paxos;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.io.BaseEncoding;
+import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.UnsafeArg;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Function;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.io.BaseEncoding;
-import com.palantir.logsafe.SafeArg;
-import com.palantir.logsafe.UnsafeArg;
-
 public class SingleLeaderLearnerNetworkClient implements PaxosLearnerNetworkClient {
 
     private static final Logger log = LoggerFactory.getLogger(SingleLeaderLearnerNetworkClient.class);
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderPinger.java b/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderPinger.java
index f7456f71545..f0b398ac3fe 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderPinger.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderPinger.java
@@ -16,6 +16,13 @@
 
 package com.palantir.paxos;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Maps;
+import com.palantir.common.base.Throwables;
+import com.palantir.common.concurrent.MultiplexingCompletionService;
+import com.palantir.leader.PaxosLeaderElectionEventRecorder;
+import com.palantir.leader.PingableLeader;
+import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import java.time.Duration;
 import java.util.Map;
 import java.util.Optional;
@@ -25,20 +32,10 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-
 import javax.annotation.Nullable;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
-import com.palantir.common.base.Throwables;
-import com.palantir.common.concurrent.MultiplexingCompletionService;
-import com.palantir.leader.PaxosLeaderElectionEventRecorder;
-import com.palantir.leader.PingableLeader;
-import com.palantir.logsafe.exceptions.SafeIllegalStateException;
-
 public class SingleLeaderPinger implements LeaderPinger {
 
     private static final Logger log = LoggerFactory.getLogger(SingleLeaderPinger.class);
diff --git a/leader-election-impl/src/test/java/com/palantir/leader/LeadershipEventRecorderTest.java b/leader-election-impl/src/test/java/com/palantir/leader/LeadershipEventRecorderTest.java
index b6376da2501..672447dfae1 100644
--- a/leader-election-impl/src/test/java/com/palantir/leader/LeadershipEventRecorderTest.java
+++ b/leader-election-impl/src/test/java/com/palantir/leader/LeadershipEventRecorderTest.java
@@ -20,14 +20,12 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
+import com.palantir.paxos.PaxosRoundFailureException;
+import com.palantir.paxos.PaxosValue;
 import java.util.Optional;
-
 import org.junit.After;
 import org.junit.Test;
 
-import com.palantir.paxos.PaxosRoundFailureException;
-import com.palantir.paxos.PaxosValue;
-
 public class LeadershipEventRecorderTest {
 
     private static final String LEADER_ID = "foo";
diff --git a/leader-election-impl/src/test/java/com/palantir/leader/PaxosLeaderEventsTest.java b/leader-election-impl/src/test/java/com/palantir/leader/PaxosLeaderEventsTest.java
index c7bb875a3b2..d2a8ec79315 100644
--- a/leader-election-impl/src/test/java/com/palantir/leader/PaxosLeaderEventsTest.java
+++ b/leader-election-impl/src/test/java/com/palantir/leader/PaxosLeaderEventsTest.java
@@ -21,21 +21,19 @@
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableMap;
+import com.palantir.paxos.LeaderPinger;
+import com.palantir.paxos.SingleLeaderPinger;
 import java.time.Duration;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableMap;
-import com.palantir.paxos.LeaderPinger;
-import com.palantir.paxos.SingleLeaderPinger;
-
 @RunWith(MockitoJUnitRunner.class)
 public class PaxosLeaderEventsTest {
 
diff --git a/leader-election-impl/src/test/java/com/palantir/leader/proxy/AwaitingLeadershipProxyTest.java b/leader-election-impl/src/test/java/com/palantir/leader/proxy/AwaitingLeadershipProxyTest.java
index 191458c6e70..cffa8b960f0 100644
--- a/leader-election-impl/src/test/java/com/palantir/leader/proxy/AwaitingLeadershipProxyTest.java
+++ b/leader-election-impl/src/test/java/com/palantir/leader/proxy/AwaitingLeadershipProxyTest.java
@@ -25,6 +25,11 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.google.common.base.Suppliers;
+import com.google.common.util.concurrent.Uninterruptibles;
+import com.palantir.leader.LeaderElectionService;
+import com.palantir.leader.NotCurrentLeaderException;
+import com.palantir.leader.PaxosLeadershipToken;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
@@ -34,16 +39,9 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.LockSupport;
 import java.util.function.Supplier;
-
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.base.Suppliers;
-import com.google.common.util.concurrent.Uninterruptibles;
-import com.palantir.leader.LeaderElectionService;
-import com.palantir.leader.NotCurrentLeaderException;
-import com.palantir.leader.PaxosLeadershipToken;
-
 public class AwaitingLeadershipProxyTest {
     private static final String TEST_MESSAGE = "test_message";
 
diff --git a/leader-election-impl/src/test/java/com/palantir/leader/proxy/SimulatingFailingServerProxy.java b/leader-election-impl/src/test/java/com/palantir/leader/proxy/SimulatingFailingServerProxy.java
index a1dd2c225a7..b8476977e9e 100644
--- a/leader-election-impl/src/test/java/com/palantir/leader/proxy/SimulatingFailingServerProxy.java
+++ b/leader-election-impl/src/test/java/com/palantir/leader/proxy/SimulatingFailingServerProxy.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.leader.proxy;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import com.palantir.common.proxy.SimulatingServerProxy;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public final class SimulatingFailingServerProxy {
 
diff --git a/leader-election-impl/src/test/java/com/palantir/leader/proxy/ToggleableExceptionProxy.java b/leader-election-impl/src/test/java/com/palantir/leader/proxy/ToggleableExceptionProxy.java
index e2521190119..35bab8efbde 100644
--- a/leader-election-impl/src/test/java/com/palantir/leader/proxy/ToggleableExceptionProxy.java
+++ b/leader-election-impl/src/test/java/com/palantir/leader/proxy/ToggleableExceptionProxy.java
@@ -15,16 +15,15 @@
  */
 package com.palantir.leader.proxy;
 
+import com.palantir.common.base.Throwables;
+import com.palantir.common.proxy.DelegatingInvocationHandler;
+import com.palantir.logsafe.Preconditions;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import com.palantir.common.base.Throwables;
-import com.palantir.common.proxy.DelegatingInvocationHandler;
-import com.palantir.logsafe.Preconditions;
-
 public final class ToggleableExceptionProxy implements DelegatingInvocationHandler {
 
     @SuppressWarnings("unchecked")
diff --git a/leader-election-impl/src/test/java/com/palantir/paxos/AllLeaderElectionTests.java b/leader-election-impl/src/test/java/com/palantir/paxos/AllLeaderElectionTests.java
index 2dcd495b0f0..fbae1f2c24b 100644
--- a/leader-election-impl/src/test/java/com/palantir/paxos/AllLeaderElectionTests.java
+++ b/leader-election-impl/src/test/java/com/palantir/paxos/AllLeaderElectionTests.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.paxos;
 
+import com.palantir.paxos.persistence.ProtobufTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-import com.palantir.paxos.persistence.ProtobufTest;
-
 @RunWith(Suite.class)
 @SuiteClasses({ProtobufTest.class, PaxosConsensusFastTest.class, PaxosConsensusSlowTest.class})
 public class AllLeaderElectionTests {}
diff --git a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusFastTest.java b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusFastTest.java
index d6b9aa39752..0750f78ce95 100644
--- a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusFastTest.java
+++ b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusFastTest.java
@@ -22,6 +22,10 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import com.palantir.common.concurrent.PTExecutors;
+import com.palantir.common.proxy.DelegatingInvocationHandler;
+import com.palantir.leader.LeaderElectionService.LeadershipToken;
+import com.palantir.leader.LeaderElectionService.StillLeadingStatus;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Proxy;
@@ -30,17 +34,11 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.commons.io.FileUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.palantir.common.concurrent.PTExecutors;
-import com.palantir.common.proxy.DelegatingInvocationHandler;
-import com.palantir.leader.LeaderElectionService.LeadershipToken;
-import com.palantir.leader.LeaderElectionService.StillLeadingStatus;
-
 public class PaxosConsensusFastTest {
     private PaxosTestState state;
 
@@ -279,4 +277,3 @@ private void restoreAllNodes() {
         }
     }
 }
-
diff --git a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusSlowTest.java b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusSlowTest.java
index e5f6bc0cfc0..ad163a029a1 100644
--- a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusSlowTest.java
+++ b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusSlowTest.java
@@ -18,17 +18,15 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
+import com.palantir.common.concurrent.PTExecutors;
 import java.util.concurrent.CompletionService;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorCompletionService;
 import java.util.concurrent.TimeUnit;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.palantir.common.concurrent.PTExecutors;
-
 public class PaxosConsensusSlowTest {
 
     Executor executor = PTExecutors.newCachedThreadPool();
diff --git a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusTestUtils.java b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusTestUtils.java
index 1cb0eec9110..0f49a930885 100644
--- a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusTestUtils.java
+++ b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusTestUtils.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.paxos;
 
-import java.io.File;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.commons.io.FileUtils;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
@@ -37,6 +28,13 @@
 import com.palantir.leader.proxy.ToggleableExceptionProxy;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import com.palantir.logsafe.exceptions.SafeRuntimeException;
+import java.io.File;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.commons.io.FileUtils;
 
 public final class PaxosConsensusTestUtils {
 
diff --git a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosLatestRoundVerifierTest.java b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosLatestRoundVerifierTest.java
index 05ed8cf56b4..7e6b60084be 100644
--- a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosLatestRoundVerifierTest.java
+++ b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosLatestRoundVerifierTest.java
@@ -22,7 +22,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.junit.Test;
 
 // TODO(nziebart): these tests are mostly sanity checks, until we have better tests for {@link PaxosQuorumChecker}.
diff --git a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosTestState.java b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosTestState.java
index 7ff97bf0e70..654114ed48e 100644
--- a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosTestState.java
+++ b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosTestState.java
@@ -18,13 +18,12 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import com.palantir.leader.LeaderElectionService;
 import com.palantir.leader.LeaderElectionService.LeadershipToken;
 import com.palantir.leader.LeaderElectionService.StillLeadingStatus;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class PaxosTestState {
     private final List leaders;
diff --git a/leader-election-impl/src/test/java/com/palantir/paxos/persistence/ProtobufTest.java b/leader-election-impl/src/test/java/com/palantir/paxos/persistence/ProtobufTest.java
index 808587645d1..2654c453878 100644
--- a/leader-election-impl/src/test/java/com/palantir/paxos/persistence/ProtobufTest.java
+++ b/leader-election-impl/src/test/java/com/palantir/paxos/persistence/ProtobufTest.java
@@ -17,8 +17,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-import org.junit.Test;
-
 import com.palantir.paxos.PaxosPromise;
 import com.palantir.paxos.PaxosPromises;
 import com.palantir.paxos.PaxosProposal;
@@ -29,6 +27,7 @@
 import com.palantir.paxos.persistence.generated.PaxosPersistence;
 import com.palantir.paxos.persistence.generated.remoting.PaxosAcceptorPersistence;
 import com.palantir.paxos.persistence.generated.remoting.PaxosAcceptorPersistence.PaxosPromiseProto;
+import org.junit.Test;
 
 public class ProtobufTest {
     @Test
diff --git a/lock-api/src/main/java/com/palantir/lock/AtlasCellLockDescriptor.java b/lock-api/src/main/java/com/palantir/lock/AtlasCellLockDescriptor.java
index 6830cd1bd4b..0e63d10d7aa 100644
--- a/lock-api/src/main/java/com/palantir/lock/AtlasCellLockDescriptor.java
+++ b/lock-api/src/main/java/com/palantir/lock/AtlasCellLockDescriptor.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.lock;
 
-import java.util.concurrent.locks.ReadWriteLock;
-
 import com.google.common.base.Strings;
 import com.palantir.logsafe.Preconditions;
+import java.util.concurrent.locks.ReadWriteLock;
 
 /**
  * A descriptor for a {@link ReadWriteLock}, identified by a lock ID (a unique
diff --git a/lock-api/src/main/java/com/palantir/lock/AtlasRowLockDescriptor.java b/lock-api/src/main/java/com/palantir/lock/AtlasRowLockDescriptor.java
index b3ab08524a0..b8bdbdf7e98 100644
--- a/lock-api/src/main/java/com/palantir/lock/AtlasRowLockDescriptor.java
+++ b/lock-api/src/main/java/com/palantir/lock/AtlasRowLockDescriptor.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.lock;
 
-import java.util.concurrent.locks.ReadWriteLock;
-
 import com.google.common.base.Strings;
 import com.palantir.logsafe.Preconditions;
+import java.util.concurrent.locks.ReadWriteLock;
 
 /**
  * A descriptor for a {@link ReadWriteLock}, identified by a lock ID (a unique
diff --git a/lock-api/src/main/java/com/palantir/lock/AtlasTimestampLockDescriptor.java b/lock-api/src/main/java/com/palantir/lock/AtlasTimestampLockDescriptor.java
index a62e0f606df..38c4bd51b90 100644
--- a/lock-api/src/main/java/com/palantir/lock/AtlasTimestampLockDescriptor.java
+++ b/lock-api/src/main/java/com/palantir/lock/AtlasTimestampLockDescriptor.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.lock;
 
-import java.util.concurrent.locks.ReadWriteLock;
-
 import com.google.common.primitives.Longs;
+import java.util.concurrent.locks.ReadWriteLock;
 
 /**
  * A descriptor for a {@link ReadWriteLock}, identified by a lock ID (a unique
diff --git a/lock-api/src/main/java/com/palantir/lock/ByteArrayLockDescriptor.java b/lock-api/src/main/java/com/palantir/lock/ByteArrayLockDescriptor.java
index a38cba510e2..7bd22c878ba 100644
--- a/lock-api/src/main/java/com/palantir/lock/ByteArrayLockDescriptor.java
+++ b/lock-api/src/main/java/com/palantir/lock/ByteArrayLockDescriptor.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.lock;
 
-import java.util.concurrent.locks.ReadWriteLock;
-
 import com.palantir.logsafe.Preconditions;
+import java.util.concurrent.locks.ReadWriteLock;
 
 /**
  * A descriptor for a {@link ReadWriteLock}, identified by a lock ID (a unique
diff --git a/lock-api/src/main/java/com/palantir/lock/ExpiringToken.java b/lock-api/src/main/java/com/palantir/lock/ExpiringToken.java
index 088299f161a..15ff374ad0a 100644
--- a/lock-api/src/main/java/com/palantir/lock/ExpiringToken.java
+++ b/lock-api/src/main/java/com/palantir/lock/ExpiringToken.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.lock;
 
+import com.google.common.primitives.Longs;
 import java.util.Comparator;
-
 import javax.annotation.Nullable;
 
-import com.google.common.primitives.Longs;
-
 /**
  * A lock server token with an expiration date.
  *
diff --git a/lock-api/src/main/java/com/palantir/lock/ForwardingRemoteLockService.java b/lock-api/src/main/java/com/palantir/lock/ForwardingRemoteLockService.java
index 7b81116ba14..9731c5d245d 100644
--- a/lock-api/src/main/java/com/palantir/lock/ForwardingRemoteLockService.java
+++ b/lock-api/src/main/java/com/palantir/lock/ForwardingRemoteLockService.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.lock;
 
+import com.google.common.collect.ForwardingObject;
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.Set;
 
-import com.google.common.collect.ForwardingObject;
-
 public abstract class ForwardingRemoteLockService extends ForwardingObject implements CloseableRemoteLockService {
 
     @Override
diff --git a/lock-api/src/main/java/com/palantir/lock/HeldLocksGrant.java b/lock-api/src/main/java/com/palantir/lock/HeldLocksGrant.java
index 123b6292ad0..7b78eb3af0b 100644
--- a/lock-api/src/main/java/com/palantir/lock/HeldLocksGrant.java
+++ b/lock-api/src/main/java/com/palantir/lock/HeldLocksGrant.java
@@ -15,17 +15,6 @@
  */
 package com.palantir.lock;
 
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-import java.math.BigInteger;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -36,6 +25,15 @@
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Iterables;
 import com.palantir.logsafe.Preconditions;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
 
 /**
  * A grant for a set of locks which are currently held by the lock server. Lock
diff --git a/lock-api/src/main/java/com/palantir/lock/HeldLocksToken.java b/lock-api/src/main/java/com/palantir/lock/HeldLocksToken.java
index 46c388f9738..d3fc8df6a80 100644
--- a/lock-api/src/main/java/com/palantir/lock/HeldLocksToken.java
+++ b/lock-api/src/main/java/com/palantir/lock/HeldLocksToken.java
@@ -15,17 +15,6 @@
  */
 package com.palantir.lock;
 
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-import java.math.BigInteger;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -36,6 +25,15 @@
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Iterables;
 import com.palantir.logsafe.Preconditions;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
 
 /**
  * A token representing a set of locks being held by a client and the
diff --git a/lock-api/src/main/java/com/palantir/lock/HeldLocksTokens.java b/lock-api/src/main/java/com/palantir/lock/HeldLocksTokens.java
index 1053255957e..daced544f25 100644
--- a/lock-api/src/main/java/com/palantir/lock/HeldLocksTokens.java
+++ b/lock-api/src/main/java/com/palantir/lock/HeldLocksTokens.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.lock;
 
-import javax.annotation.Nullable;
-
 import com.google.common.base.Function;
+import javax.annotation.Nullable;
 
 public final class HeldLocksTokens {
     private HeldLocksTokens() {/**/}
diff --git a/lock-api/src/main/java/com/palantir/lock/LockClient.java b/lock-api/src/main/java/com/palantir/lock/LockClient.java
index 8ad59f490da..c60c098ff98 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockClient.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockClient.java
@@ -15,19 +15,17 @@
  */
 package com.palantir.lock;
 
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Objects;
 import com.google.common.base.Strings;
 import com.palantir.logsafe.Preconditions;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
 
 /**
  * A client of the lock server. Clients who desire reentrancy are required to
diff --git a/lock-api/src/main/java/com/palantir/lock/LockCollection.java b/lock-api/src/main/java/com/palantir/lock/LockCollection.java
index e36a2a4210a..bd5ae62d5b6 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockCollection.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockCollection.java
@@ -15,6 +15,9 @@
  */
 package com.palantir.lock;
 
+import com.google.common.collect.AbstractIterator;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
 import java.io.Serializable;
 import java.util.AbstractCollection;
 import java.util.Arrays;
@@ -26,10 +29,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import com.google.common.collect.AbstractIterator;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
-
 /**
  * Replacement for when you would normally use Map<T, LockMode>,
  * but don't actually need the keys to be a set, or to have random
diff --git a/lock-api/src/main/java/com/palantir/lock/LockCollections.java b/lock-api/src/main/java/com/palantir/lock/LockCollections.java
index 328557077e4..742b08c0a75 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockCollections.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockCollections.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.lock;
 
-import java.util.Comparator;
-import java.util.Map;
-import java.util.SortedMap;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Ordering;
 import com.palantir.logsafe.Preconditions;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.SortedMap;
 
 public final class LockCollections {
 
diff --git a/lock-api/src/main/java/com/palantir/lock/LockDescriptor.java b/lock-api/src/main/java/com/palantir/lock/LockDescriptor.java
index d76e4cc3b2f..ae33c284a99 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockDescriptor.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockDescriptor.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.lock;
 
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.concurrent.locks.ReadWriteLock;
-
-import javax.annotation.concurrent.Immutable;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -28,6 +22,10 @@
 import com.google.common.base.Charsets;
 import com.google.common.io.BaseEncoding;
 import com.google.common.primitives.UnsignedBytes;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.concurrent.locks.ReadWriteLock;
+import javax.annotation.concurrent.Immutable;
 
 /**
  * A descriptor for a {@link ReadWriteLock}.
diff --git a/lock-api/src/main/java/com/palantir/lock/LockRefreshToken.java b/lock-api/src/main/java/com/palantir/lock/LockRefreshToken.java
index 03831957db3..340d0ed8375 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockRefreshToken.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockRefreshToken.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.lock;
 
-import java.io.Serializable;
-import java.math.BigInteger;
-
-import javax.annotation.concurrent.Immutable;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.palantir.logsafe.Preconditions;
+import java.io.Serializable;
+import java.math.BigInteger;
+import javax.annotation.concurrent.Immutable;
 
 @Immutable
 public final class LockRefreshToken implements Serializable {
diff --git a/lock-api/src/main/java/com/palantir/lock/LockRequest.java b/lock-api/src/main/java/com/palantir/lock/LockRequest.java
index ce1c7a957de..26330249eb4 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockRequest.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockRequest.java
@@ -15,19 +15,6 @@
  */
 package com.palantir.lock;
 
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-import javax.annotation.concurrent.NotThreadSafe;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -39,6 +26,17 @@
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Iterables;
 import com.palantir.logsafe.Preconditions;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+import javax.annotation.concurrent.NotThreadSafe;
 
 /**
  * An encapsulation of all parameters needed to make a locking request to the
diff --git a/lock-api/src/main/java/com/palantir/lock/LockResponse.java b/lock-api/src/main/java/com/palantir/lock/LockResponse.java
index cb42de939f0..2eb67aa19f0 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockResponse.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockResponse.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.lock;
 
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -33,6 +23,14 @@
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableSortedMap;
 import com.palantir.logsafe.Preconditions;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
 
 /**
  * Represents the result of calling {@link LockService#lockWithFullLockResponse(LockClient, LockRequest)} on
diff --git a/lock-api/src/main/java/com/palantir/lock/LockServerOptions.java b/lock-api/src/main/java/com/palantir/lock/LockServerOptions.java
index 528eedd9ecd..8fa92c93e8d 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockServerOptions.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockServerOptions.java
@@ -15,21 +15,18 @@
  */
 package com.palantir.lock;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
 import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.util.concurrent.TimeUnit;
-
 import javax.annotation.Nullable;
-
 import org.immutables.value.Value;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
 /**
  * Provides the set of options which can be passed to the
  * lock server upon construction.
diff --git a/lock-api/src/main/java/com/palantir/lock/LockService.java b/lock-api/src/main/java/com/palantir/lock/LockService.java
index b81aceb0214..a5db306b7a1 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockService.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockService.java
@@ -15,9 +15,14 @@
  */
 package com.palantir.lock;
 
+import com.google.common.annotations.Beta;
+import com.palantir.annotations.remoting.CancelableServerCall;
+import com.palantir.common.annotation.Idempotent;
+import com.palantir.common.annotation.NonIdempotent;
+import com.palantir.logsafe.Safe;
+import com.palantir.processors.AutoDelegate;
 import java.math.BigInteger;
 import java.util.Set;
-
 import javax.annotation.Nullable;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
@@ -26,13 +31,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.google.common.annotations.Beta;
-import com.palantir.annotations.remoting.CancelableServerCall;
-import com.palantir.common.annotation.Idempotent;
-import com.palantir.common.annotation.NonIdempotent;
-import com.palantir.logsafe.Safe;
-import com.palantir.processors.AutoDelegate;
-
 /**
  * Defines the service which handles locking operations.
  *
diff --git a/lock-api/src/main/java/com/palantir/lock/LockWithClient.java b/lock-api/src/main/java/com/palantir/lock/LockWithClient.java
index f60f43ad540..af8787e4638 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockWithClient.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockWithClient.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.lock;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableLockWithClient.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/LockWithMode.java b/lock-api/src/main/java/com/palantir/lock/LockWithMode.java
index 84c7704eee5..d3163fb2101 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockWithMode.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockWithMode.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.lock;
 
-import java.util.Objects;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Objects;
 
 public class LockWithMode {
     private LockDescriptor lockDescriptor;
diff --git a/lock-api/src/main/java/com/palantir/lock/RemoteLockService.java b/lock-api/src/main/java/com/palantir/lock/RemoteLockService.java
index a2f7275f841..bfbe023d8d5 100644
--- a/lock-api/src/main/java/com/palantir/lock/RemoteLockService.java
+++ b/lock-api/src/main/java/com/palantir/lock/RemoteLockService.java
@@ -15,8 +15,10 @@
  */
 package com.palantir.lock;
 
+import com.palantir.common.annotation.Idempotent;
+import com.palantir.common.annotation.NonIdempotent;
+import com.palantir.logsafe.Safe;
 import java.util.Set;
-
 import javax.annotation.Nullable;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
@@ -25,10 +27,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.common.annotation.Idempotent;
-import com.palantir.common.annotation.NonIdempotent;
-import com.palantir.logsafe.Safe;
-
 public interface RemoteLockService {
     /**
      * Attempts to acquire the requested set of locks for the given client.
diff --git a/lock-api/src/main/java/com/palantir/lock/SimpleHeldLocksToken.java b/lock-api/src/main/java/com/palantir/lock/SimpleHeldLocksToken.java
index 04329a43a49..e5edf4012c9 100644
--- a/lock-api/src/main/java/com/palantir/lock/SimpleHeldLocksToken.java
+++ b/lock-api/src/main/java/com/palantir/lock/SimpleHeldLocksToken.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.lock;
 
-import java.io.Serializable;
-import java.math.BigInteger;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.palantir.logsafe.Preconditions;
+import java.io.Serializable;
+import java.math.BigInteger;
 
 public class SimpleHeldLocksToken implements Serializable {
     private static final long serialVersionUID = 1L;
diff --git a/lock-api/src/main/java/com/palantir/lock/SimpleTimeDuration.java b/lock-api/src/main/java/com/palantir/lock/SimpleTimeDuration.java
index d3bbe01f94b..e4180e2475f 100644
--- a/lock-api/src/main/java/com/palantir/lock/SimpleTimeDuration.java
+++ b/lock-api/src/main/java/com/palantir/lock/SimpleTimeDuration.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.lock;
 
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.primitives.Longs;
 import com.palantir.logsafe.Preconditions;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
 
 /**
  * A simple, immutable implementation of {@link TimeDuration}.
diff --git a/lock-api/src/main/java/com/palantir/lock/SimplifyingLockService.java b/lock-api/src/main/java/com/palantir/lock/SimplifyingLockService.java
index a99b05e73b4..e4be0ca3aaf 100644
--- a/lock-api/src/main/java/com/palantir/lock/SimplifyingLockService.java
+++ b/lock-api/src/main/java/com/palantir/lock/SimplifyingLockService.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.lock;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import java.util.Map;
+import java.util.Set;
 
 public abstract class SimplifyingLockService implements AutoDelegate_LockService, CloseableLockService {
 
diff --git a/lock-api/src/main/java/com/palantir/lock/SortedLockCollection.java b/lock-api/src/main/java/com/palantir/lock/SortedLockCollection.java
index fc5df8e0705..228f6ebf70d 100644
--- a/lock-api/src/main/java/com/palantir/lock/SortedLockCollection.java
+++ b/lock-api/src/main/java/com/palantir/lock/SortedLockCollection.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.lock;
 
+import com.google.common.collect.Iterables;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import com.google.common.collect.Iterables;
-
 /**
  * Replacement for when you would normally use SortedMap<T, LockMode>,
  * but don't actually need the keys to be a set, or to have random
diff --git a/lock-api/src/main/java/com/palantir/lock/StringLockDescriptor.java b/lock-api/src/main/java/com/palantir/lock/StringLockDescriptor.java
index 793d5a65f61..1ecf8f0c560 100644
--- a/lock-api/src/main/java/com/palantir/lock/StringLockDescriptor.java
+++ b/lock-api/src/main/java/com/palantir/lock/StringLockDescriptor.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.lock;
 
-import java.util.concurrent.locks.ReadWriteLock;
-
 import com.google.common.base.Charsets;
 import com.google.common.base.Strings;
 import com.palantir.logsafe.Preconditions;
+import java.util.concurrent.locks.ReadWriteLock;
 
 /**
  * A descriptor for a {@link ReadWriteLock}, identified by a lock ID (a unique
diff --git a/lock-api/src/main/java/com/palantir/lock/TimeDuration.java b/lock-api/src/main/java/com/palantir/lock/TimeDuration.java
index 47b9a3e1323..44825e1d0a2 100644
--- a/lock-api/src/main/java/com/palantir/lock/TimeDuration.java
+++ b/lock-api/src/main/java/com/palantir/lock/TimeDuration.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.lock;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import java.util.concurrent.TimeUnit;
-
 import javax.annotation.Nullable;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
 /**
  * A container class to encapsulate a {@link TimeUnit} with a {@code long}
  * duration.
diff --git a/lock-api/src/main/java/com/palantir/lock/TimelockNamespace.java b/lock-api/src/main/java/com/palantir/lock/TimelockNamespace.java
index 5164cc4f3bf..ee6303d9a6a 100644
--- a/lock-api/src/main/java/com/palantir/lock/TimelockNamespace.java
+++ b/lock-api/src/main/java/com/palantir/lock/TimelockNamespace.java
@@ -16,11 +16,10 @@
 
 package com.palantir.lock;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableTimelockNamespace.class)
 @JsonDeserialize(as = ImmutableTimelockNamespace.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/client/AsyncTimeLockUnlocker.java b/lock-api/src/main/java/com/palantir/lock/client/AsyncTimeLockUnlocker.java
index 2c4bcbe2d7f..c690e35c302 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/AsyncTimeLockUnlocker.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/AsyncTimeLockUnlocker.java
@@ -15,19 +15,17 @@
  */
 package com.palantir.lock.client;
 
-import java.util.Collection;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.autobatch.Autobatchers;
 import com.palantir.atlasdb.autobatch.BatchElement;
 import com.palantir.atlasdb.autobatch.DisruptorAutobatcher;
 import com.palantir.lock.v2.LockToken;
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.logsafe.SafeArg;
+import java.util.Collection;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Releases lock tokens from a {@link TimelockService} asynchronously.
diff --git a/lock-api/src/main/java/com/palantir/lock/client/IdentifiedLockRequest.java b/lock-api/src/main/java/com/palantir/lock/client/IdentifiedLockRequest.java
index ca3f8c8537f..d90ab7f2fbd 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/IdentifiedLockRequest.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/IdentifiedLockRequest.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.lock.client;
 
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.v2.LockRequest;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableIdentifiedLockRequest.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/client/LeasedLockToken.java b/lock-api/src/main/java/com/palantir/lock/client/LeasedLockToken.java
index 34256d752c9..3caa8c6f563 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/LeasedLockToken.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/LeasedLockToken.java
@@ -16,15 +16,13 @@
 
 package com.palantir.lock.client;
 
-import java.util.UUID;
-
-import javax.annotation.concurrent.GuardedBy;
-
 import com.palantir.lock.v2.LeaderTime;
 import com.palantir.lock.v2.Lease;
 import com.palantir.lock.v2.LockToken;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
+import java.util.UUID;
+import javax.annotation.concurrent.GuardedBy;
 
 final class LeasedLockToken implements LockToken {
     private final LockToken serverToken;
@@ -56,7 +54,7 @@ synchronized Lease getLease() {
 
     synchronized void updateLease(Lease newLease) {
         Preconditions.checkArgument(lease.leaderTime().isComparableWith(newLease.leaderTime()),
-                "Lock leases can only be refreshed by lease owners. Current leader id: {}, new leader id: {}",
+                "Lock leases can only be refreshed by lease owners",
                 SafeArg.of("currentLeaderId", lease.leaderTime().id()),
                 SafeArg.of("newLeaderId", newLease.leaderTime().id()));
 
diff --git a/lock-api/src/main/java/com/palantir/lock/client/LockLeaseService.java b/lock-api/src/main/java/com/palantir/lock/client/LockLeaseService.java
index 2b1a66abf2d..6914cc72621 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/LockLeaseService.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/LockLeaseService.java
@@ -16,10 +16,6 @@
 
 package com.palantir.lock.client;
 
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Sets;
 import com.palantir.common.concurrent.CoalescingSupplier;
@@ -38,6 +34,9 @@
 import com.palantir.lock.v2.StartTransactionResponseV4;
 import com.palantir.lock.v2.TimelockRpcClient;
 import com.palantir.logsafe.Preconditions;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
 
 class LockLeaseService {
     private final TimelockRpcClient delegate;
diff --git a/lock-api/src/main/java/com/palantir/lock/client/LockRefresher.java b/lock-api/src/main/java/com/palantir/lock/client/LockRefresher.java
index 4b9962b28bd..012ccbc4554 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/LockRefresher.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/LockRefresher.java
@@ -15,22 +15,20 @@
  */
 package com.palantir.lock.client;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Sets;
+import com.palantir.lock.v2.LockToken;
+import com.palantir.lock.v2.TimelockService;
+import com.palantir.logsafe.SafeArg;
 import java.util.Collection;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-import com.palantir.lock.v2.LockToken;
-import com.palantir.lock.v2.TimelockService;
-import com.palantir.logsafe.SafeArg;
-
 public class LockRefresher implements AutoCloseable {
 
     private final Logger log = LoggerFactory.getLogger(LockRefresher.class);
diff --git a/lock-api/src/main/java/com/palantir/lock/client/LockRefreshingLockService.java b/lock-api/src/main/java/com/palantir/lock/client/LockRefreshingLockService.java
index d4a62eb7948..3bbdce883a1 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/LockRefreshingLockService.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/LockRefreshingLockService.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.lock.client;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
@@ -37,6 +27,14 @@
 import com.palantir.lock.LockService;
 import com.palantir.lock.SimpleHeldLocksToken;
 import com.palantir.lock.SimplifyingLockService;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class LockRefreshingLockService extends SimplifyingLockService {
     public static final int REFRESH_BATCH_SIZE = 500_000;
diff --git a/lock-api/src/main/java/com/palantir/lock/client/LockRefreshingRemoteLockService.java b/lock-api/src/main/java/com/palantir/lock/client/LockRefreshingRemoteLockService.java
index 725362aad9b..5833eab73b1 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/LockRefreshingRemoteLockService.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/LockRefreshingRemoteLockService.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.lock.client;
 
-import java.io.IOException;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.common.concurrent.PTExecutors;
 import com.palantir.lock.ForwardingRemoteLockService;
@@ -31,6 +22,13 @@
 import com.palantir.lock.LockRefreshToken;
 import com.palantir.lock.LockRequest;
 import com.palantir.lock.RemoteLockService;
+import java.io.IOException;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @SuppressWarnings("checkstyle:FinalClass") // Avoid breaking API in case someone extended this
 public class LockRefreshingRemoteLockService extends ForwardingRemoteLockService {
diff --git a/lock-api/src/main/java/com/palantir/lock/client/LockTokenShare.java b/lock-api/src/main/java/com/palantir/lock/client/LockTokenShare.java
index 7dc92c061f9..d724a989456 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/LockTokenShare.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/LockTokenShare.java
@@ -16,14 +16,13 @@
 
 package com.palantir.lock.client;
 
+import com.palantir.lock.v2.LockToken;
+import com.palantir.logsafe.Preconditions;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import com.palantir.lock.v2.LockToken;
-import com.palantir.logsafe.Preconditions;
-
 final class LockTokenShare implements LockToken {
     private final UUID requestId;
     private final LockToken sharedLockToken;
diff --git a/lock-api/src/main/java/com/palantir/lock/client/ProfilingTimelockService.java b/lock-api/src/main/java/com/palantir/lock/client/ProfilingTimelockService.java
index 6e3c51b603e..86c5da42b1b 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/ProfilingTimelockService.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/ProfilingTimelockService.java
@@ -16,17 +16,6 @@
 
 package com.palantir.lock.client;
 
-import java.time.Duration;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.BooleanSupplier;
-import java.util.function.Supplier;
-
-import org.immutables.value.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Stopwatch;
 import com.google.common.util.concurrent.RateLimiter;
@@ -42,6 +31,15 @@
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
 import com.palantir.timestamp.TimestampRange;
+import java.time.Duration;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BooleanSupplier;
+import java.util.function.Supplier;
+import org.immutables.value.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Logs operations on an underlying {@link TimelockService} that take a long time (defined as longer than
diff --git a/lock-api/src/main/java/com/palantir/lock/client/RemoteTimelockServiceAdapter.java b/lock-api/src/main/java/com/palantir/lock/client/RemoteTimelockServiceAdapter.java
index 08ec563e6e1..f03d4d44250 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/RemoteTimelockServiceAdapter.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/RemoteTimelockServiceAdapter.java
@@ -16,8 +16,6 @@
 
 package com.palantir.lock.client;
 
-import java.util.Set;
-
 import com.palantir.lock.v2.LockImmutableTimestampResponse;
 import com.palantir.lock.v2.LockRequest;
 import com.palantir.lock.v2.LockResponse;
@@ -28,6 +26,7 @@
 import com.palantir.lock.v2.WaitForLocksRequest;
 import com.palantir.lock.v2.WaitForLocksResponse;
 import com.palantir.timestamp.TimestampRange;
+import java.util.Set;
 
 public final class RemoteTimelockServiceAdapter implements TimelockService, AutoCloseable {
     private final TimelockRpcClient timelockRpcClient;
diff --git a/lock-api/src/main/java/com/palantir/lock/client/TimeLockClient.java b/lock-api/src/main/java/com/palantir/lock/client/TimeLockClient.java
index 61a0d61b6fe..cb32a38d259 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/TimeLockClient.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/TimeLockClient.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.lock.client;
 
-import java.net.ConnectException;
-import java.net.UnknownHostException;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ScheduledExecutorService;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.palantir.common.base.Throwables;
@@ -37,6 +31,11 @@
 import com.palantir.timestamp.CloseableTimestampService;
 import com.palantir.timestamp.RequestBatchingTimestampService;
 import com.palantir.timestamp.TimestampRange;
+import java.net.ConnectException;
+import java.net.UnknownHostException;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ScheduledExecutorService;
 
 public class TimeLockClient implements AutoCloseable, TimelockService {
 
diff --git a/lock-api/src/main/java/com/palantir/lock/client/TimeLockUnlocker.java b/lock-api/src/main/java/com/palantir/lock/client/TimeLockUnlocker.java
index 94e8fa6160a..1da694614f9 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/TimeLockUnlocker.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/TimeLockUnlocker.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.lock.client;
 
+import com.palantir.lock.v2.LockToken;
 import java.io.Closeable;
 import java.util.Set;
 
-import com.palantir.lock.v2.LockToken;
-
 public interface TimeLockUnlocker extends Closeable {
     void enqueue(Set tokens);
 
diff --git a/lock-api/src/main/java/com/palantir/lock/client/TransactionStarter.java b/lock-api/src/main/java/com/palantir/lock/client/TransactionStarter.java
index c1a3a3e6e23..c567e9abd12 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/TransactionStarter.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/TransactionStarter.java
@@ -16,15 +16,6 @@
 
 package com.palantir.lock.client;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
@@ -39,6 +30,14 @@
 import com.palantir.lock.v2.StartIdentifiedAtlasDbTransactionResponse;
 import com.palantir.lock.v2.StartTransactionResponseV4;
 import com.palantir.lock.v2.TimestampAndPartition;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * A service responsible for coalescing multiple start transaction calls into a single start transactions call. This
diff --git a/lock-api/src/main/java/com/palantir/lock/package-info.java b/lock-api/src/main/java/com/palantir/lock/package-info.java
index e8c845640f9..bfb618842e3 100644
--- a/lock-api/src/main/java/com/palantir/lock/package-info.java
+++ b/lock-api/src/main/java/com/palantir/lock/package-info.java
@@ -17,5 +17,3 @@
 package com.palantir.lock;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-
-
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/IdentifiedTimeLockRequest.java b/lock-api/src/main/java/com/palantir/lock/v2/IdentifiedTimeLockRequest.java
index 74b1bfba24a..ded74aebce2 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/IdentifiedTimeLockRequest.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/IdentifiedTimeLockRequest.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.lock.v2;
 
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableIdentifiedTimeLockRequest.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/LeaderTime.java b/lock-api/src/main/java/com/palantir/lock/v2/LeaderTime.java
index 36ffd966b15..0c04214d28c 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/LeaderTime.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/LeaderTime.java
@@ -16,11 +16,10 @@
 
 package com.palantir.lock.v2;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.common.time.NanoTime;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableLeaderTime.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/LeadershipId.java b/lock-api/src/main/java/com/palantir/lock/v2/LeadershipId.java
index e1079681a6b..d9189e65879 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/LeadershipId.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/LeadershipId.java
@@ -16,12 +16,10 @@
 
 package com.palantir.lock.v2;
 
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @Value.Style(visibility = Value.Style.ImplementationVisibility.PACKAGE)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/Lease.java b/lock-api/src/main/java/com/palantir/lock/v2/Lease.java
index 974846455b4..54f4133c94d 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/Lease.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/Lease.java
@@ -16,13 +16,11 @@
 
 package com.palantir.lock.v2;
 
-import java.time.Duration;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.common.time.NanoTime;
+import java.time.Duration;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableLease.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/LockImmutableTimestampResponse.java b/lock-api/src/main/java/com/palantir/lock/v2/LockImmutableTimestampResponse.java
index a41b7cf00c9..9d1c1174714 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/LockImmutableTimestampResponse.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/LockImmutableTimestampResponse.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.lock.v2;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableLockImmutableTimestampResponse.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/LockRequest.java b/lock-api/src/main/java/com/palantir/lock/v2/LockRequest.java
index d5be82ccabf..4a0c739cbd9 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/LockRequest.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/LockRequest.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.lock.v2;
 
-import java.util.Optional;
-import java.util.Set;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.lock.LockDescriptor;
+import java.util.Optional;
+import java.util.Set;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableLockRequest.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/LockResponse.java b/lock-api/src/main/java/com/palantir/lock/v2/LockResponse.java
index 7b5642b486d..fdf8892f18b 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/LockResponse.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/LockResponse.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.lock.v2;
 
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableLockResponse.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/LockResponseV2.java b/lock-api/src/main/java/com/palantir/lock/v2/LockResponseV2.java
index f7535a0e075..0761518b419 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/LockResponseV2.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/LockResponseV2.java
@@ -16,15 +16,13 @@
 
 package com.palantir.lock.v2;
 
-import java.util.function.Function;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.function.Function;
+import org.immutables.value.Value;
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
 @JsonSubTypes({
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/LockToken.java b/lock-api/src/main/java/com/palantir/lock/v2/LockToken.java
index 5bfe515522d..a031c57fb3e 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/LockToken.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/LockToken.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.lock.v2;
 
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableLockToken.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/PartitionedTimestamps.java b/lock-api/src/main/java/com/palantir/lock/v2/PartitionedTimestamps.java
index 768f51d65c5..4b1bc91f776 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/PartitionedTimestamps.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/PartitionedTimestamps.java
@@ -16,14 +16,12 @@
 
 package com.palantir.lock.v2;
 
-import java.util.stream.LongStream;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.primitives.Ints;
+import java.util.stream.LongStream;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutablePartitionedTimestamps.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/RefreshLockResponseV2.java b/lock-api/src/main/java/com/palantir/lock/v2/RefreshLockResponseV2.java
index 4518262d74b..1040729d18b 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/RefreshLockResponseV2.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/RefreshLockResponseV2.java
@@ -16,12 +16,10 @@
 
 package com.palantir.lock.v2;
 
-import java.util.Set;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.Set;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableRefreshLockResponseV2.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/StartAtlasDbTransactionResponse.java b/lock-api/src/main/java/com/palantir/lock/v2/StartAtlasDbTransactionResponse.java
index eb6eec7bb6b..3ff4e13ba49 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/StartAtlasDbTransactionResponse.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/StartAtlasDbTransactionResponse.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.lock.v2;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableStartAtlasDbTransactionResponse.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/StartAtlasDbTransactionResponseV3.java b/lock-api/src/main/java/com/palantir/lock/v2/StartAtlasDbTransactionResponseV3.java
index ebadbe0aa65..b456bb93dc9 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/StartAtlasDbTransactionResponseV3.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/StartAtlasDbTransactionResponseV3.java
@@ -16,11 +16,10 @@
 
 package com.palantir.lock.v2;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableStartAtlasDbTransactionResponseV3.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/StartIdentifiedAtlasDbTransactionRequest.java b/lock-api/src/main/java/com/palantir/lock/v2/StartIdentifiedAtlasDbTransactionRequest.java
index ce6a008d986..46134d1d9ac 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/StartIdentifiedAtlasDbTransactionRequest.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/StartIdentifiedAtlasDbTransactionRequest.java
@@ -16,12 +16,10 @@
 
 package com.palantir.lock.v2;
 
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableStartIdentifiedAtlasDbTransactionRequest.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/StartIdentifiedAtlasDbTransactionResponse.java b/lock-api/src/main/java/com/palantir/lock/v2/StartIdentifiedAtlasDbTransactionResponse.java
index 678a9789224..a284a4770ae 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/StartIdentifiedAtlasDbTransactionResponse.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/StartIdentifiedAtlasDbTransactionResponse.java
@@ -16,10 +16,9 @@
 
 package com.palantir.lock.v2;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableStartIdentifiedAtlasDbTransactionResponse.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionRequestV4.java b/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionRequestV4.java
index be62567b7fc..6ca944d6b1d 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionRequestV4.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionRequestV4.java
@@ -16,12 +16,10 @@
 
 package com.palantir.lock.v2;
 
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableStartTransactionRequestV4.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionResponseV4.java b/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionResponseV4.java
index 3cb974e5a66..10bf836c938 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionResponseV4.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionResponseV4.java
@@ -16,10 +16,9 @@
 
 package com.palantir.lock.v2;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableStartTransactionResponseV4.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/TimelockRpcClient.java b/lock-api/src/main/java/com/palantir/lock/v2/TimelockRpcClient.java
index 60238876a03..a5ec59e0760 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/TimelockRpcClient.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/TimelockRpcClient.java
@@ -16,8 +16,10 @@
 
 package com.palantir.lock.v2;
 
+import com.palantir.lock.client.IdentifiedLockRequest;
+import com.palantir.logsafe.Safe;
+import com.palantir.timestamp.TimestampRange;
 import java.util.Set;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -26,10 +28,6 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.lock.client.IdentifiedLockRequest;
-import com.palantir.logsafe.Safe;
-import com.palantir.timestamp.TimestampRange;
-
 /**
  * Interface describing timelock endpoints to be used by feign client factories to create raw clients.
  *
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/TimelockService.java b/lock-api/src/main/java/com/palantir/lock/v2/TimelockService.java
index 6d228d6aebc..78efe8ff305 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/TimelockService.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/TimelockService.java
@@ -15,13 +15,11 @@
  */
 package com.palantir.lock.v2;
 
-import java.util.Set;
-
-import javax.ws.rs.QueryParam;
-
 import com.palantir.logsafe.Safe;
 import com.palantir.processors.AutoDelegate;
 import com.palantir.timestamp.TimestampRange;
+import java.util.Set;
+import javax.ws.rs.QueryParam;
 
 @AutoDelegate
 public interface TimelockService {
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/TimestampAndPartition.java b/lock-api/src/main/java/com/palantir/lock/v2/TimestampAndPartition.java
index 3e98c5677d1..23c3eccb885 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/TimestampAndPartition.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/TimestampAndPartition.java
@@ -16,10 +16,9 @@
 
 package com.palantir.lock.v2;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 /**
  * A pair of a timestamp along with a numeric partition identifier that may be used by some Atlas clients operating
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/WaitForLocksRequest.java b/lock-api/src/main/java/com/palantir/lock/v2/WaitForLocksRequest.java
index 017e7068ab4..55c776fce72 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/WaitForLocksRequest.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/WaitForLocksRequest.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.lock.v2;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.palantir.lock.LockDescriptor;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-
 import org.immutables.value.Value;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.palantir.lock.LockDescriptor;
-
 @Value.Immutable
 @JsonSerialize(as = ImmutableWaitForLocksRequest.class)
 @JsonDeserialize(as = ImmutableWaitForLocksRequest.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/WaitForLocksResponse.java b/lock-api/src/main/java/com/palantir/lock/v2/WaitForLocksResponse.java
index 949080f14c7..39617b76058 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/WaitForLocksResponse.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/WaitForLocksResponse.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.lock.v2;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableWaitForLocksResponse.class)
diff --git a/lock-api/src/test/java/com/palantir/lock/HeldLocksTokenTest.java b/lock-api/src/test/java/com/palantir/lock/HeldLocksTokenTest.java
index f761845734a..6d87cfdaeaa 100644
--- a/lock-api/src/test/java/com/palantir/lock/HeldLocksTokenTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/HeldLocksTokenTest.java
@@ -18,15 +18,13 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableSortedMap;
 import java.math.BigInteger;
 import java.util.SortedMap;
 import java.util.concurrent.TimeUnit;
-
 import org.junit.Test;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableSortedMap;
-
 public final class HeldLocksTokenTest {
 
     private final ObjectMapper mapper = new ObjectMapper();
diff --git a/lock-api/src/test/java/com/palantir/lock/LockClientTest.java b/lock-api/src/test/java/com/palantir/lock/LockClientTest.java
index c13bae3c8e4..a9dcc9ecf9b 100644
--- a/lock-api/src/test/java/com/palantir/lock/LockClientTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/LockClientTest.java
@@ -18,9 +18,8 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
 
 public final class LockClientTest {
     private final ObjectMapper mapper = new ObjectMapper();
diff --git a/lock-api/src/test/java/com/palantir/lock/LockDescriptorTest.java b/lock-api/src/test/java/com/palantir/lock/LockDescriptorTest.java
index fafb2be4a3a..fbe657b5f47 100644
--- a/lock-api/src/test/java/com/palantir/lock/LockDescriptorTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/LockDescriptorTest.java
@@ -19,10 +19,9 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
-import org.junit.Test;
-
 import com.google.common.base.Charsets;
 import com.google.common.io.BaseEncoding;
+import org.junit.Test;
 
 public class LockDescriptorTest {
 
diff --git a/lock-api/src/test/java/com/palantir/lock/client/AsyncTimeLockUnlockerTest.java b/lock-api/src/test/java/com/palantir/lock/client/AsyncTimeLockUnlockerTest.java
index 3862661215a..1f0f3e3c95b 100644
--- a/lock-api/src/test/java/com/palantir/lock/client/AsyncTimeLockUnlockerTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/client/AsyncTimeLockUnlockerTest.java
@@ -23,6 +23,11 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.Uninterruptibles;
+import com.palantir.lock.v2.LockToken;
+import com.palantir.lock.v2.TimelockService;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
@@ -30,19 +35,12 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.awaitility.Awaitility;
 import org.awaitility.Duration;
 import org.awaitility.core.ThrowingRunnable;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-import com.google.common.util.concurrent.Uninterruptibles;
-import com.palantir.lock.v2.LockToken;
-import com.palantir.lock.v2.TimelockService;
-
 public class AsyncTimeLockUnlockerTest {
     private static final int ONE_THOUSAND = 1000;
 
diff --git a/lock-api/src/test/java/com/palantir/lock/client/IdentifiedLockRequestTest.java b/lock-api/src/test/java/com/palantir/lock/client/IdentifiedLockRequestTest.java
index 82b25b76ef1..6f9a9813b3e 100644
--- a/lock-api/src/test/java/com/palantir/lock/client/IdentifiedLockRequestTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/client/IdentifiedLockRequestTest.java
@@ -18,11 +18,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.guava.GuavaModule;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+import org.junit.Test;
 
 public class IdentifiedLockRequestTest {
     private static final String SERIALIZED_LOCK_REQUEST = "{"
diff --git a/lock-api/src/test/java/com/palantir/lock/client/LeasedLockTokenTest.java b/lock-api/src/test/java/com/palantir/lock/client/LeasedLockTokenTest.java
index 7a7ca0dc009..7f339eb3346 100644
--- a/lock-api/src/test/java/com/palantir/lock/client/LeasedLockTokenTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/client/LeasedLockTokenTest.java
@@ -19,16 +19,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.time.Duration;
-import java.util.UUID;
-
-import org.junit.Test;
-
 import com.palantir.common.time.NanoTime;
 import com.palantir.lock.v2.LeaderTime;
 import com.palantir.lock.v2.LeadershipId;
 import com.palantir.lock.v2.Lease;
 import com.palantir.lock.v2.LockToken;
+import java.time.Duration;
+import java.util.UUID;
+import org.junit.Test;
 
 public class LeasedLockTokenTest {
     private static final LockToken LOCK_TOKEN = LockToken.of(UUID.randomUUID());
diff --git a/lock-api/src/test/java/com/palantir/lock/client/LockLeaseServiceTest.java b/lock-api/src/test/java/com/palantir/lock/client/LockLeaseServiceTest.java
index 189fd9b096c..24b11c72078 100644
--- a/lock-api/src/test/java/com/palantir/lock/client/LockLeaseServiceTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/client/LockLeaseServiceTest.java
@@ -22,18 +22,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.time.Duration;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Supplier;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.common.time.NanoTime;
@@ -49,6 +37,16 @@
 import com.palantir.lock.v2.RefreshLockResponseV2;
 import com.palantir.lock.v2.StartTransactionResponseV4;
 import com.palantir.lock.v2.TimelockRpcClient;
+import java.time.Duration;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class LockLeaseServiceTest {
@@ -225,4 +223,3 @@ private LeaderTime getIdentifiedTime() {
         return LeaderTime.of(LEADER_ID, time.get());
     }
 }
-
diff --git a/lock-api/src/test/java/com/palantir/lock/client/LockRefresherTest.java b/lock-api/src/test/java/com/palantir/lock/client/LockRefresherTest.java
index 3bbf4c176b2..bb66a2cd30e 100644
--- a/lock-api/src/test/java/com/palantir/lock/client/LockRefresherTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/client/LockRefresherTest.java
@@ -22,16 +22,14 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableSet;
+import com.palantir.lock.v2.LockToken;
+import com.palantir.lock.v2.TimelockService;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
-
 import org.jmock.lib.concurrent.DeterministicScheduler;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableSet;
-import com.palantir.lock.v2.LockToken;
-import com.palantir.lock.v2.TimelockService;
-
 public class LockRefresherTest {
 
     private static final long REFRESH_INTERVAL_MILLIS = 1234L;
diff --git a/lock-api/src/test/java/com/palantir/lock/client/LockTokenShareTest.java b/lock-api/src/test/java/com/palantir/lock/client/LockTokenShareTest.java
index d23de7d5f89..6523f67f669 100644
--- a/lock-api/src/test/java/com/palantir/lock/client/LockTokenShareTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/client/LockTokenShareTest.java
@@ -19,15 +19,13 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.palantir.lock.v2.LockToken;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.junit.Test;
 
-import com.palantir.lock.v2.LockToken;
-
 public class LockTokenShareTest {
     private static final LockToken LOCK_TOKEN = LockToken.of(UUID.randomUUID());
 
diff --git a/lock-api/src/test/java/com/palantir/lock/client/ProfilingTimelockServiceTest.java b/lock-api/src/test/java/com/palantir/lock/client/ProfilingTimelockServiceTest.java
index a466258fa85..c05c10b232b 100644
--- a/lock-api/src/test/java/com/palantir/lock/client/ProfilingTimelockServiceTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/client/ProfilingTimelockServiceTest.java
@@ -25,16 +25,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.BooleanSupplier;
-
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-import org.slf4j.Logger;
-
 import com.google.common.base.Stopwatch;
 import com.google.common.base.Ticker;
 import com.google.common.collect.ImmutableSet;
@@ -43,6 +33,14 @@
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.lock.v2.WaitForLocksRequest;
 import com.palantir.logsafe.Arg;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.BooleanSupplier;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.slf4j.Logger;
 
 public class ProfilingTimelockServiceTest {
     private static final Duration SHORT_DURATION = ProfilingTimelockService.SLOW_THRESHOLD.dividedBy(5);
diff --git a/lock-api/src/test/java/com/palantir/lock/client/TimeLockClientTest.java b/lock-api/src/test/java/com/palantir/lock/client/TimeLockClientTest.java
index 45e8cc1ad90..a8b3863b0ae 100644
--- a/lock-api/src/test/java/com/palantir/lock/client/TimeLockClientTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/client/TimeLockClientTest.java
@@ -26,14 +26,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.net.ConnectException;
-import java.net.UnknownHostException;
-import java.util.UUID;
-
-import org.junit.Test;
-import org.mockito.InOrder;
-import org.mockito.Mockito;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.common.exception.AtlasDbDependencyException;
 import com.palantir.leader.NotCurrentLeaderException;
@@ -47,6 +39,12 @@
 import com.palantir.lock.v2.WaitForLocksRequest;
 import com.palantir.timestamp.CloseableTimestampService;
 import com.palantir.timestamp.TimestampRange;
+import java.net.ConnectException;
+import java.net.UnknownHostException;
+import java.util.UUID;
+import org.junit.Test;
+import org.mockito.InOrder;
+import org.mockito.Mockito;
 
 public class TimeLockClientTest {
 
diff --git a/lock-api/src/test/java/com/palantir/lock/client/TransactionStarterTest.java b/lock-api/src/test/java/com/palantir/lock/client/TransactionStarterTest.java
index 74ef78af560..6d2fb82474d 100644
--- a/lock-api/src/test/java/com/palantir/lock/client/TransactionStarterTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/client/TransactionStarterTest.java
@@ -17,27 +17,11 @@
 package com.palantir.lock.client;
 
 import static java.util.stream.Collectors.toList;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.time.Duration;
-import java.util.List;
-import java.util.UUID;
-import java.util.stream.IntStream;
-
-import javax.annotation.Nullable;
-
-import org.immutables.value.Value;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.SettableFuture;
@@ -52,6 +36,18 @@
 import com.palantir.lock.v2.PartitionedTimestamps;
 import com.palantir.lock.v2.StartIdentifiedAtlasDbTransactionResponse;
 import com.palantir.lock.v2.StartTransactionResponseV4;
+import java.time.Duration;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.IntStream;
+import javax.annotation.Nullable;
+import org.immutables.value.Value;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TransactionStarterTest {
diff --git a/lock-api/src/test/java/com/palantir/lock/v2/IdentifiedTimeLockRequestSerializationDeserializationTest.java b/lock-api/src/test/java/com/palantir/lock/v2/IdentifiedTimeLockRequestSerializationDeserializationTest.java
index 52139f6c531..7b43cabd910 100644
--- a/lock-api/src/test/java/com/palantir/lock/v2/IdentifiedTimeLockRequestSerializationDeserializationTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/v2/IdentifiedTimeLockRequestSerializationDeserializationTest.java
@@ -17,17 +17,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.palantir.conjure.java.serialization.ObjectMappers;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.UUID;
-
 import org.junit.Test;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.palantir.conjure.java.serialization.ObjectMappers;
-
 public class IdentifiedTimeLockRequestSerializationDeserializationTest {
     private static final ObjectMapper OBJECT_MAPPER = ObjectMappers.newServerObjectMapper();
     private static final UUID SAMPLE_UUID = UUID.fromString("ed4b106f-8718-4858-a402-d99415124cfe");
diff --git a/lock-api/src/test/java/com/palantir/lock/v2/LeadershipIdTest.java b/lock-api/src/test/java/com/palantir/lock/v2/LeadershipIdTest.java
index bde33ec7652..4e741b3f99f 100644
--- a/lock-api/src/test/java/com/palantir/lock/v2/LeadershipIdTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/v2/LeadershipIdTest.java
@@ -18,9 +18,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
 
 public class LeadershipIdTest {
     private static final String SERIALIZED_LEADERSHIP_ID = "\"fc71247c-66a5-4f94-be24-3a2b00d29968\"";
diff --git a/lock-api/src/test/java/com/palantir/lock/v2/LeaseTest.java b/lock-api/src/test/java/com/palantir/lock/v2/LeaseTest.java
index 75912cea089..35a03e8f574 100644
--- a/lock-api/src/test/java/com/palantir/lock/v2/LeaseTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/v2/LeaseTest.java
@@ -18,13 +18,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.time.Duration;
-
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.palantir.common.time.NanoTime;
+import java.time.Duration;
+import org.junit.Test;
 
 public class LeaseTest {
     private static final LeadershipId LEADERSHIP_ID_1 = LeadershipId.random();
diff --git a/lock-api/src/test/java/com/palantir/lock/v2/LockResponseV2Test.java b/lock-api/src/test/java/com/palantir/lock/v2/LockResponseV2Test.java
index 6e55034a513..7894a2d986f 100644
--- a/lock-api/src/test/java/com/palantir/lock/v2/LockResponseV2Test.java
+++ b/lock-api/src/test/java/com/palantir/lock/v2/LockResponseV2Test.java
@@ -19,14 +19,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.time.Duration;
-import java.util.UUID;
-
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.palantir.common.time.NanoTime;
+import java.time.Duration;
+import java.util.UUID;
+import org.junit.Test;
 
 public class LockResponseV2Test {
     private static final LockToken LOCK_TOKEN = LockToken.of(UUID.randomUUID());
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/KnownClientLock.java b/lock-impl/src/main/java/com/palantir/lock/impl/KnownClientLock.java
index 2878e52c987..f2ca2114f33 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/KnownClientLock.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/KnownClientLock.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.lock.impl;
 
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.Nullable;
-
 import com.palantir.lock.LockClient;
 import com.palantir.lock.LockMode;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
 
 /**
  * A reentrant lock linked to a specific {@link LockClient}.
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/LegacyTimelockService.java b/lock-impl/src/main/java/com/palantir/lock/impl/LegacyTimelockService.java
index 3f3e04076ef..2f479e37934 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/LegacyTimelockService.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/LegacyTimelockService.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.lock.impl;
 
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -42,6 +37,10 @@
 import com.palantir.lock.v2.WaitForLocksResponse;
 import com.palantir.timestamp.TimestampRange;
 import com.palantir.timestamp.TimestampService;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * A {@link TimelockService} implementation that delegates to a {@link LockService} and {@link TimestampService}.
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/LockClientIndices.java b/lock-impl/src/main/java/com/palantir/lock/impl/LockClientIndices.java
index 1ddcc12b7ed..1440e4693a6 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/LockClientIndices.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/LockClientIndices.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.lock.impl;
 
-import java.util.Map;
-
-import javax.annotation.concurrent.ThreadSafe;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 import com.palantir.lock.LockClient;
 import com.palantir.logsafe.Preconditions;
+import java.util.Map;
+import javax.annotation.concurrent.ThreadSafe;
 
 @ThreadSafe
 @VisibleForTesting
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/LockServerLock.java b/lock-impl/src/main/java/com/palantir/lock/impl/LockServerLock.java
index 532c6f17d8a..cef8d47fa6a 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/LockServerLock.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/LockServerLock.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.lock.impl;
 
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.MoreObjects;
 import com.palantir.lock.LockClient;
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.LockMode;
 import com.palantir.logsafe.Preconditions;
+import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class LockServerLock implements ClientAwareReadWriteLock {
     private static final Logger log = LoggerFactory.getLogger(LockServerLock.class);
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/LockServerSync.java b/lock-impl/src/main/java/com/palantir/lock/impl/LockServerSync.java
index def88be6af1..e8f035c0a97 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/LockServerSync.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/LockServerSync.java
@@ -15,20 +15,17 @@
  */
 package com.palantir.lock.impl;
 
-import java.util.concurrent.locks.AbstractQueuedSynchronizer;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Ints;
 import com.palantir.lock.LockClient;
 import com.palantir.logsafe.Preconditions;
-
 import gnu.trove.iterator.TIntIntIterator;
 import gnu.trove.map.TIntIntMap;
 import gnu.trove.map.hash.TIntIntHashMap;
+import java.util.concurrent.locks.AbstractQueuedSynchronizer;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.GuardedBy;
 
 class LockServerSync extends AbstractQueuedSynchronizer {
     private static final long serialVersionUID = 1L;
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceImpl.java b/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceImpl.java
index 92db1c4d7ae..5b54a566ad3 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceImpl.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceImpl.java
@@ -21,36 +21,6 @@
 import static com.palantir.lock.LockGroupBehavior.LOCK_ALL_OR_NONE;
 import static com.palantir.lock.LockGroupBehavior.LOCK_AS_MANY_AS_POSSIBLE;
 
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.PriorityBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Supplier;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-import javax.annotation.concurrent.ThreadSafe;
-
-import org.joda.time.DateTime;
-import org.joda.time.format.ISODateTimeFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.helpers.MessageFormatter;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
@@ -107,6 +77,33 @@
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import com.palantir.util.JMXUtils;
 import com.palantir.util.Ownable;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.PriorityBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+import javax.annotation.concurrent.ThreadSafe;
+import org.joda.time.DateTime;
+import org.joda.time.format.ISODateTimeFormat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.helpers.MessageFormatter;
 
 /**
  * Implementation of the Lock Server.
@@ -209,16 +206,16 @@ public ClientAwareReadWriteLock load(LockDescriptor from) {
 
     /** The mapping from lock client to the set of tokens held by that client. */
     private final SetMultimap lockClientMultimap =
-            Multimaps.synchronizedSetMultimap(HashMultimap.create());
+            Multimaps.synchronizedSetMultimap(HashMultimap.create());
 
     private final SetMultimap outstandingLockRequestMultimap =
-        Multimaps.synchronizedSetMultimap(HashMultimap.create());
+        Multimaps.synchronizedSetMultimap(HashMultimap.create());
 
     private final Set indefinitelyBlockingThreads =
             ConcurrentHashMap.newKeySet();
 
     private final Multimap versionIdMap = Multimaps.synchronizedMultimap(
-            Multimaps.newMultimap(Maps.>newHashMap(), TreeMultiset::create));
+            Multimaps.newMultimap(Maps.newHashMap(), TreeMultiset::create));
 
     private static final AtomicInteger instanceCount = new AtomicInteger();
     private static final int MAX_FAILED_LOCKS_TO_LOG = 20;
@@ -425,7 +422,7 @@ public LockResponse lockWithFullLockResponse(LockClient client, LockRequest requ
             } catch (Throwable e) { // (authorized)
                 log.error("Internal lock server error: state has been corrupted!!",
                         UnsafeArg.of("exception", e),
-                        SafeArg.of("stacktrace", e.getStackTrace()));
+                        SafeArg.of("stacktrace", e.getStackTrace()), e);
                 throw Throwables.throwUncheckedException(e);
             }
         }
@@ -1116,7 +1113,7 @@ private void tryRenameThread(String name) {
         try {
             Thread.currentThread().setName(name);
         } catch (SecurityException ex) {
-            requestLogger.error("Cannot rename LockServer threads");
+            requestLogger.error("Cannot rename LockServer threads", ex);
         }
     }
 
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceStateDebugger.java b/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceStateDebugger.java
index 5ad2d0c1d46..3a4d5bb444b 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceStateDebugger.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceStateDebugger.java
@@ -16,12 +16,6 @@
 
 package com.palantir.lock.impl;
 
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.collect.Lists;
@@ -32,6 +26,10 @@
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.LockMode;
 import com.palantir.lock.LockRequest;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import org.immutables.value.Value;
 
 /**
  * Note: This class does NOT strictly guarantee that state returned is up to date across all requests.
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/LockTokenConverter.java b/lock-impl/src/main/java/com/palantir/lock/impl/LockTokenConverter.java
index f0fc6cfc04b..862a576fe8f 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/LockTokenConverter.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/LockTokenConverter.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.lock.impl;
 
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.UUID;
-
 import com.palantir.lock.LockRefreshToken;
 import com.palantir.lock.v2.LockToken;
 import com.palantir.logsafe.Preconditions;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.util.UUID;
 
 class LockTokenConverter {
 
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/SlowLockLogger.java b/lock-impl/src/main/java/com/palantir/lock/impl/SlowLockLogger.java
index f1ded39ebfa..9a8a668953e 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/SlowLockLogger.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/SlowLockLogger.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.lock.impl;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * This is a logger intended for use tracking down problems arising from
  * PDS-50301 (Product hogs threads on timelock server with HTTP/2 protocol). This is currently logging the locks
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/ThreadPooledLockService.java b/lock-impl/src/main/java/com/palantir/lock/impl/ThreadPooledLockService.java
index f38a7c53cf1..9c449953209 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/ThreadPooledLockService.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/ThreadPooledLockService.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.lock.impl;
 
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Set;
-import java.util.concurrent.Semaphore;
-
-import javax.annotation.Nullable;
-
 import com.palantir.lock.CloseableLockService;
 import com.palantir.lock.HeldLocksGrant;
 import com.palantir.lock.HeldLocksToken;
@@ -32,6 +25,11 @@
 import com.palantir.lock.LockServerOptions;
 import com.palantir.lock.LockService;
 import com.palantir.lock.SimpleHeldLocksToken;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Set;
+import java.util.concurrent.Semaphore;
+import javax.annotation.Nullable;
 
 public class ThreadPooledLockService implements CloseableLockService {
     private final ThreadPooledWrapper wrapper;
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/ThreadPooledWrapper.java b/lock-impl/src/main/java/com/palantir/lock/impl/ThreadPooledWrapper.java
index 4c04a38840d..936db542fd5 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/ThreadPooledWrapper.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/ThreadPooledWrapper.java
@@ -15,13 +15,11 @@
  */
 package com.palantir.lock.impl;
 
+import com.palantir.common.base.FunctionCheckedException;
 import java.util.concurrent.Semaphore;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.common.base.FunctionCheckedException;
-
 public class ThreadPooledWrapper {
     private static final Logger log = LoggerFactory.getLogger(ThreadPooledWrapper.class);
 
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/package-info.java b/lock-impl/src/main/java/com/palantir/lock/impl/package-info.java
index 580036b4e52..28761c016be 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/package-info.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/package-info.java
@@ -16,4 +16,3 @@
 @ParametersAreNonnullByDefault package com.palantir.lock.impl;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-
diff --git a/lock-impl/src/main/java/com/palantir/lock/logger/LockDescriptorMapper.java b/lock-impl/src/main/java/com/palantir/lock/logger/LockDescriptorMapper.java
index f038a3394e3..878d644d771 100644
--- a/lock-impl/src/main/java/com/palantir/lock/logger/LockDescriptorMapper.java
+++ b/lock-impl/src/main/java/com/palantir/lock/logger/LockDescriptorMapper.java
@@ -16,13 +16,12 @@
 package com.palantir.lock.logger;
 
 
+import com.google.common.collect.Maps;
+import com.palantir.lock.LockDescriptor;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
-import com.google.common.collect.Maps;
-import com.palantir.lock.LockDescriptor;
-
 
 /**
  * Lock descriptors may contain obfuscated sensitive information. We want to make it impossible to get a real descriptor,
diff --git a/lock-impl/src/main/java/com/palantir/lock/logger/LockServiceStateLogger.java b/lock-impl/src/main/java/com/palantir/lock/logger/LockServiceStateLogger.java
index 904f008963b..8d2f182931d 100644
--- a/lock-impl/src/main/java/com/palantir/lock/logger/LockServiceStateLogger.java
+++ b/lock-impl/src/main/java/com/palantir/lock/logger/LockServiceStateLogger.java
@@ -15,22 +15,6 @@
  */
 package com.palantir.lock.logger;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.helpers.MessageFormatter;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -48,6 +32,20 @@
 import com.palantir.lock.impl.LockServerLock;
 import com.palantir.lock.impl.LockServiceImpl;
 import com.palantir.lock.impl.LockServiceStateDebugger;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.helpers.MessageFormatter;
 
 public class LockServiceStateLogger {
     private static Logger log = LoggerFactory.getLogger(LockServiceStateLogger.class);
diff --git a/lock-impl/src/main/java/com/palantir/lock/logger/LockServiceTestUtils.java b/lock-impl/src/main/java/com/palantir/lock/logger/LockServiceTestUtils.java
index 4ea0f7d8de3..9e0e0bf5781 100644
--- a/lock-impl/src/main/java/com/palantir/lock/logger/LockServiceTestUtils.java
+++ b/lock-impl/src/main/java/com/palantir/lock/logger/LockServiceTestUtils.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.lock.logger;
 
-import java.io.File;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.List;
-
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Lists;
 import com.palantir.lock.HeldLocksToken;
@@ -30,6 +24,11 @@
 import com.palantir.lock.LockMode;
 import com.palantir.lock.LockRequest;
 import com.palantir.lock.StringLockDescriptor;
+import java.io.File;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.List;
 
 public class LockServiceTestUtils {
     public static final String TEST_LOG_STATE_DIR = "log-state";
diff --git a/lock-impl/src/main/java/com/palantir/lock/logger/LockStateYamlWriter.java b/lock-impl/src/main/java/com/palantir/lock/logger/LockStateYamlWriter.java
index a12b338c9dc..051cdf6d774 100644
--- a/lock-impl/src/main/java/com/palantir/lock/logger/LockStateYamlWriter.java
+++ b/lock-impl/src/main/java/com/palantir/lock/logger/LockStateYamlWriter.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.lock.logger;
 
+import com.palantir.lock.LockDescriptor;
 import java.io.BufferedWriter;
 import java.io.Closeable;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
-
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.nodes.Tag;
 import org.yaml.snakeyaml.representer.Representer;
 
-import com.palantir.lock.LockDescriptor;
-
 /**
  * A simple wrapper for writing lock state as YAML to a file.
  */
diff --git a/lock-impl/src/main/java/com/palantir/lock/logger/SanitizedLockRequestProgress.java b/lock-impl/src/main/java/com/palantir/lock/logger/SanitizedLockRequestProgress.java
index d7ad2110c5a..cc7db00f2ec 100644
--- a/lock-impl/src/main/java/com/palantir/lock/logger/SanitizedLockRequestProgress.java
+++ b/lock-impl/src/main/java/com/palantir/lock/logger/SanitizedLockRequestProgress.java
@@ -16,16 +16,14 @@
 
 package com.palantir.lock.logger;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.palantir.lock.impl.LockServiceStateDebugger;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
-
 import org.immutables.value.Value;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.palantir.lock.impl.LockServiceStateDebugger;
-
 @Value.Immutable
 @JsonSerialize(as = ImmutableSanitizedLockRequestProgress.class)
 @JsonDeserialize(as = ImmutableSanitizedLockRequestProgress.class)
diff --git a/lock-impl/src/main/java/com/palantir/lock/logger/SimpleLockRequest.java b/lock-impl/src/main/java/com/palantir/lock/logger/SimpleLockRequest.java
index 90b189a33d2..8d149aedc0f 100644
--- a/lock-impl/src/main/java/com/palantir/lock/logger/SimpleLockRequest.java
+++ b/lock-impl/src/main/java/com/palantir/lock/logger/SimpleLockRequest.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.lock.logger;
 
-import javax.annotation.Nullable;
-
-import org.immutables.value.Value;
-
 import com.palantir.lock.BlockingMode;
 import com.palantir.lock.LockGroupBehavior;
 import com.palantir.lock.LockMode;
 import com.palantir.lock.LockRequest;
 import com.palantir.lock.TimeDuration;
+import javax.annotation.Nullable;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class SimpleLockRequest {
diff --git a/lock-impl/src/main/java/com/palantir/lock/logger/SimpleTokenInfo.java b/lock-impl/src/main/java/com/palantir/lock/logger/SimpleTokenInfo.java
index 4e493750d49..739c0259e74 100644
--- a/lock-impl/src/main/java/com/palantir/lock/logger/SimpleTokenInfo.java
+++ b/lock-impl/src/main/java/com/palantir/lock/logger/SimpleTokenInfo.java
@@ -15,15 +15,12 @@
  */
 package com.palantir.lock.logger;
 
-import java.util.Date;
-
-import javax.annotation.Nullable;
-
-import org.immutables.value.Value;
-
 import com.palantir.lock.HeldLocksToken;
 import com.palantir.lock.LockMode;
 import com.palantir.logsafe.Preconditions;
+import java.util.Date;
+import javax.annotation.Nullable;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class SimpleTokenInfo {
diff --git a/lock-impl/src/test/java/com/palantir/lock/AllLockTests.java b/lock-impl/src/test/java/com/palantir/lock/AllLockTests.java
index dbb7f5258d8..cf619ddfeee 100644
--- a/lock-impl/src/test/java/com/palantir/lock/AllLockTests.java
+++ b/lock-impl/src/test/java/com/palantir/lock/AllLockTests.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.lock;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
 import com.palantir.lock.client.LockRefreshingLockServiceTest;
 import com.palantir.lock.impl.ClientAwareLockTest;
 import com.palantir.lock.logger.LockServiceStateLoggerTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
 
 /**
  * Runs all lock server tests.
diff --git a/lock-impl/src/test/java/com/palantir/lock/LockServiceTest.java b/lock-impl/src/test/java/com/palantir/lock/LockServiceTest.java
index 2ecb222a8a4..ba908cc48d7 100644
--- a/lock-impl/src/test/java/com/palantir/lock/LockServiceTest.java
+++ b/lock-impl/src/test/java/com/palantir/lock/LockServiceTest.java
@@ -15,21 +15,6 @@
  */
 package com.palantir.lock;
 
-import java.io.File;
-import java.util.List;
-import java.util.SortedMap;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
@@ -43,6 +28,19 @@
 import com.palantir.lock.logger.LockServiceTestUtils;
 import com.palantir.util.Mutable;
 import com.palantir.util.Mutables;
+import java.io.File;
+import java.util.List;
+import java.util.SortedMap;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * Tests for the Lock Server.
diff --git a/lock-impl/src/test/java/com/palantir/lock/client/LockRefreshingLockServiceTest.java b/lock-impl/src/test/java/com/palantir/lock/client/LockRefreshingLockServiceTest.java
index 3c3b19fc8d0..90cc6eb7c81 100644
--- a/lock-impl/src/test/java/com/palantir/lock/client/LockRefreshingLockServiceTest.java
+++ b/lock-impl/src/test/java/com/palantir/lock/client/LockRefreshingLockServiceTest.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.lock.client;
 
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSortedMap;
 import com.palantir.lock.HeldLocksToken;
@@ -36,6 +29,11 @@
 import com.palantir.lock.SimpleTimeDuration;
 import com.palantir.lock.StringLockDescriptor;
 import com.palantir.lock.impl.LockServiceImpl;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 public class LockRefreshingLockServiceTest {
     private LockService server;
diff --git a/lock-impl/src/test/java/com/palantir/lock/impl/ClientAwareLockTest.java b/lock-impl/src/test/java/com/palantir/lock/impl/ClientAwareLockTest.java
index 66aa633961b..69884e2138c 100644
--- a/lock-impl/src/test/java/com/palantir/lock/impl/ClientAwareLockTest.java
+++ b/lock-impl/src/test/java/com/palantir/lock/impl/ClientAwareLockTest.java
@@ -15,6 +15,15 @@
  */
 package com.palantir.lock.impl;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.common.concurrent.InterruptibleFuture;
+import com.palantir.common.concurrent.NamedThreadFactory;
+import com.palantir.common.concurrent.PTExecutors;
+import com.palantir.flake.FlakeRetryingRule;
+import com.palantir.flake.ShouldRetry;
+import com.palantir.lock.LockClient;
+import com.palantir.lock.LockMode;
+import com.palantir.lock.StringLockDescriptor;
 import java.util.Queue;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -23,23 +32,12 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.common.concurrent.InterruptibleFuture;
-import com.palantir.common.concurrent.NamedThreadFactory;
-import com.palantir.common.concurrent.PTExecutors;
-import com.palantir.flake.FlakeRetryingRule;
-import com.palantir.flake.ShouldRetry;
-import com.palantir.lock.LockClient;
-import com.palantir.lock.LockMode;
-import com.palantir.lock.StringLockDescriptor;
-
 /**
  * Tests for {@link ClientAwareReadWriteLockImpl}.
  *
diff --git a/lock-impl/src/test/java/com/palantir/lock/impl/LegacyTimelockServiceTest.java b/lock-impl/src/test/java/com/palantir/lock/impl/LegacyTimelockServiceTest.java
index 1728b3de233..4dd47854292 100644
--- a/lock-impl/src/test/java/com/palantir/lock/impl/LegacyTimelockServiceTest.java
+++ b/lock-impl/src/test/java/com/palantir/lock/impl/LegacyTimelockServiceTest.java
@@ -20,17 +20,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.math.BigInteger;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InOrder;
-import org.mockito.Mockito;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Maps;
@@ -49,6 +38,15 @@
 import com.palantir.lock.v2.WaitForLocksRequest;
 import com.palantir.timestamp.TimestampRange;
 import com.palantir.timestamp.TimestampService;
+import java.math.BigInteger;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InOrder;
+import org.mockito.Mockito;
 
 public class LegacyTimelockServiceTest {
 
diff --git a/lock-impl/src/test/java/com/palantir/lock/impl/LockServiceImplTest.java b/lock-impl/src/test/java/com/palantir/lock/impl/LockServiceImplTest.java
index d7e2ee9da72..ec91ebb0739 100644
--- a/lock-impl/src/test/java/com/palantir/lock/impl/LockServiceImplTest.java
+++ b/lock-impl/src/test/java/com/palantir/lock/impl/LockServiceImplTest.java
@@ -17,10 +17,19 @@
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
-
 import static uk.org.lidalia.slf4jtest.LoggingEvent.debug;
 import static uk.org.lidalia.slf4jtest.LoggingEvent.warn;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableSortedMap;
+import com.palantir.lock.LockClient;
+import com.palantir.lock.LockMode;
+import com.palantir.lock.LockRefreshToken;
+import com.palantir.lock.LockRequest;
+import com.palantir.lock.LockServerOptions;
+import com.palantir.lock.SimpleTimeDuration;
+import com.palantir.lock.StringLockDescriptor;
+import com.palantir.lock.client.LockRefreshingLockService;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.List;
@@ -28,24 +37,11 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
 import org.assertj.core.api.Assertions;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableSortedMap;
-import com.palantir.lock.LockClient;
-import com.palantir.lock.LockMode;
-import com.palantir.lock.LockRefreshToken;
-import com.palantir.lock.LockRequest;
-import com.palantir.lock.LockServerOptions;
-import com.palantir.lock.SimpleTimeDuration;
-import com.palantir.lock.StringLockDescriptor;
-import com.palantir.lock.client.LockRefreshingLockService;
-
 import uk.org.lidalia.slf4jext.Level;
 import uk.org.lidalia.slf4jtest.LoggingEvent;
 import uk.org.lidalia.slf4jtest.TestLogger;
diff --git a/lock-impl/src/test/java/com/palantir/lock/impl/LockTokenConverterTest.java b/lock-impl/src/test/java/com/palantir/lock/impl/LockTokenConverterTest.java
index 73f41705ea4..c1121bc483c 100644
--- a/lock-impl/src/test/java/com/palantir/lock/impl/LockTokenConverterTest.java
+++ b/lock-impl/src/test/java/com/palantir/lock/impl/LockTokenConverterTest.java
@@ -18,14 +18,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.palantir.lock.LockRefreshToken;
+import com.palantir.lock.v2.LockToken;
 import java.math.BigInteger;
 import java.util.Random;
-
 import org.junit.Test;
 
-import com.palantir.lock.LockRefreshToken;
-import com.palantir.lock.v2.LockToken;
-
 public class LockTokenConverterTest {
 
     private static final Random RANDOM = new Random(123);
diff --git a/lock-impl/src/test/java/com/palantir/lock/impl/ThreadPooledWrapperTest.java b/lock-impl/src/test/java/com/palantir/lock/impl/ThreadPooledWrapperTest.java
index eda396f5196..894d6a99ec8 100644
--- a/lock-impl/src/test/java/com/palantir/lock/impl/ThreadPooledWrapperTest.java
+++ b/lock-impl/src/test/java/com/palantir/lock/impl/ThreadPooledWrapperTest.java
@@ -19,6 +19,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
+import com.google.common.collect.Lists;
+import com.palantir.common.base.FunctionCheckedException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
@@ -29,13 +31,9 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.collect.Lists;
-import com.palantir.common.base.FunctionCheckedException;
-
 public class ThreadPooledWrapperTest {
     private static final Waiter WAITER = new Waiter();
 
diff --git a/lock-impl/src/test/java/com/palantir/lock/logger/LockServiceSerDeTest.java b/lock-impl/src/test/java/com/palantir/lock/logger/LockServiceSerDeTest.java
index 60eee212ede..dda92cb6f8b 100644
--- a/lock-impl/src/test/java/com/palantir/lock/logger/LockServiceSerDeTest.java
+++ b/lock-impl/src/test/java/com/palantir/lock/logger/LockServiceSerDeTest.java
@@ -17,12 +17,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-import java.math.BigInteger;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -37,6 +31,10 @@
 import com.palantir.lock.LockServerOptions;
 import com.palantir.lock.SimpleTimeDuration;
 import com.palantir.lock.StringLockDescriptor;
+import java.math.BigInteger;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import org.junit.Test;
 
 public class LockServiceSerDeTest {
 
diff --git a/lock-impl/src/test/java/com/palantir/lock/logger/LockServiceStateLoggerTest.java b/lock-impl/src/test/java/com/palantir/lock/logger/LockServiceStateLoggerTest.java
index 9ed2a28b2c8..6fefa478e80 100644
--- a/lock-impl/src/test/java/com/palantir/lock/logger/LockServiceStateLoggerTest.java
+++ b/lock-impl/src/test/java/com/palantir/lock/logger/LockServiceStateLoggerTest.java
@@ -19,26 +19,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.nio.file.Files;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import org.assertj.core.util.Strings;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.yaml.snakeyaml.Yaml;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.MapMaker;
@@ -59,6 +39,24 @@
 import com.palantir.lock.impl.LockClientIndices;
 import com.palantir.lock.impl.LockServerLock;
 import com.palantir.lock.impl.LockServiceImpl;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import org.assertj.core.util.Strings;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.yaml.snakeyaml.Yaml;
 
 public class LockServiceStateLoggerTest {
 
diff --git a/scripts/circle-ci/run-circle-tests.sh b/scripts/circle-ci/run-circle-tests.sh
index 8ea5d5fc247..c5b2ee41004 100755
--- a/scripts/circle-ci/run-circle-tests.sh
+++ b/scripts/circle-ci/run-circle-tests.sh
@@ -24,7 +24,7 @@ CONTAINER_5=(':lock-impl:check' ':atlasdb-dbkvs-tests:check' ':atlasdb-ete-test-
 
 CONTAINER_6=(':atlasdb-ete-tests:dbkvsTest' ':timelock-server:integTest')
 
-CONTAINER_7=('compileJava' 'compileTestJava')
+CONTAINER_7=('compileJava' 'compileTestJava' 'compileIntegTestJava')
 
 # Container 0 - runs tasks not found in the below containers
 CONTAINER_0_EXCLUDE=("${CONTAINER_1[@]}" "${CONTAINER_2[@]}" "${CONTAINER_3[@]}" "${CONTAINER_4[@]}" "${CONTAINER_5[@]}" "${CONTAINER_6[@]}")
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchingNetworkClientFactories.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchingNetworkClientFactories.java
index 81e5f299d66..e215407a4e8 100644
--- a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchingNetworkClientFactories.java
+++ b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchingNetworkClientFactories.java
@@ -18,7 +18,6 @@
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;
-
 import org.immutables.value.Value;
 
 @Value.Immutable
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/ClientPaxosResourceFactory.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/ClientPaxosResourceFactory.java
index 62d90dca965..c3c8b2eb22e 100644
--- a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/ClientPaxosResourceFactory.java
+++ b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/ClientPaxosResourceFactory.java
@@ -16,14 +16,6 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.io.Closeable;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Supplier;
-
-import org.immutables.value.Value;
-
 import com.google.common.base.Suppliers;
 import com.palantir.atlasdb.factory.DynamicDecoratingProxy;
 import com.palantir.atlasdb.util.MetricsManager;
@@ -32,6 +24,12 @@
 import com.palantir.timelock.config.PaxosRuntimeConfiguration;
 import com.palantir.timelock.config.TimeLockInstallConfiguration;
 import com.palantir.timelock.paxos.PaxosRemotingUtils;
+import java.io.Closeable;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Supplier;
+import org.immutables.value.Value;
 
 public final class ClientPaxosResourceFactory {
 
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalAndRemotes.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalAndRemotes.java
index 362c58ce538..60143799bad 100644
--- a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalAndRemotes.java
+++ b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalAndRemotes.java
@@ -16,18 +16,16 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
 import org.immutables.value.Value;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
 @Value.Immutable
 interface LocalAndRemotes {
     @Value.Parameter
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/NetworkClientFactories.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/NetworkClientFactories.java
index b2f0bb8ea0b..b561e14534a 100644
--- a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/NetworkClientFactories.java
+++ b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/NetworkClientFactories.java
@@ -16,14 +16,12 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.palantir.paxos.PaxosAcceptorNetworkClient;
+import com.palantir.paxos.PaxosLearnerNetworkClient;
 import java.io.Closeable;
 import java.util.List;
-
 import org.immutables.value.Value;
 
-import com.palantir.paxos.PaxosAcceptorNetworkClient;
-import com.palantir.paxos.PaxosLearnerNetworkClient;
-
 @Value.Immutable
 public interface NetworkClientFactories {
     Factory acceptor();
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/SingleLeaderNetworkClientFactories.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/SingleLeaderNetworkClientFactories.java
index f53fedd6777..baba388ae3d 100644
--- a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/SingleLeaderNetworkClientFactories.java
+++ b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/SingleLeaderNetworkClientFactories.java
@@ -16,11 +16,6 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-
-import org.immutables.value.Value;
-
 import com.palantir.atlasdb.timelock.paxos.NetworkClientFactories.Factory;
 import com.palantir.paxos.PaxosAcceptor;
 import com.palantir.paxos.PaxosAcceptorNetworkClient;
@@ -32,6 +27,9 @@
 import com.palantir.timelock.paxos.ClientAwarePaxosAcceptorAdapter;
 import com.palantir.timelock.paxos.ClientAwarePaxosLearner;
 import com.palantir.timelock.paxos.ClientAwarePaxosLearnerAdapter;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import org.immutables.value.Value;
 
 @Value.Immutable
 abstract class SingleLeaderNetworkClientFactories {
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/TimelockProxyFactories.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/TimelockProxyFactories.java
index dfd46b54604..5aa7b29033d 100644
--- a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/TimelockProxyFactories.java
+++ b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/TimelockProxyFactories.java
@@ -16,13 +16,6 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.immutables.value.Value;
-
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.atlasdb.factory.ServiceCreator;
 import com.palantir.atlasdb.http.AtlasDbHttpClients;
@@ -30,6 +23,11 @@
 import com.palantir.conjure.java.config.ssl.TrustContext;
 import com.palantir.timelock.config.TimeLockInstallConfiguration;
 import com.palantir.timelock.paxos.PaxosRemotingUtils;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class TimelockProxyFactories {
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/config/ClusterConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/ClusterConfiguration.java
index d39c9a7ca8c..3f3fb3480f3 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/config/ClusterConfiguration.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/config/ClusterConfiguration.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.timelock.config;
 
-import java.util.List;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.google.common.base.Preconditions;
 import com.palantir.conjure.java.api.config.service.PartialServiceConfiguration;
+import java.util.List;
+import org.immutables.value.Value;
 
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/config/DatabaseTsBoundPersisterConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/DatabaseTsBoundPersisterConfiguration.java
index a72158fe479..173a063ef73 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/config/DatabaseTsBoundPersisterConfiguration.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/config/DatabaseTsBoundPersisterConfiguration.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.timelock.config;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableDatabaseTsBoundPersisterConfiguration.class)
 @JsonSerialize(as = ImmutableDatabaseTsBoundPersisterConfiguration.class)
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/config/DefaultClusterConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/DefaultClusterConfiguration.java
index 5b26eded27e..b2935927a77 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/config/DefaultClusterConfiguration.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/config/DefaultClusterConfiguration.java
@@ -16,12 +16,10 @@
 package com.palantir.timelock.config;
 
 
-import java.util.List;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.List;
+import org.immutables.value.Value;
 
 /** Generates cluster membership based upon pre-populated values. */
 @Value.Immutable
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/config/KubernetesClusterConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/KubernetesClusterConfiguration.java
index e5ec340b7b1..15bce0b9281 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/config/KubernetesClusterConfiguration.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/config/KubernetesClusterConfiguration.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.timelock.config;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Preconditions;
 import com.palantir.timelock.utils.KubernetesHostnames;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.immutables.value.Value;
 
 /**
  * Generates the current hostname, and those of the expected members of the cluster if the server is being executed
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosInstallConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosInstallConfiguration.java
index ca0f560b4a5..83df2425f8a 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosInstallConfiguration.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosInstallConfiguration.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.timelock.config;
 
-import java.io.File;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
+import java.io.File;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutablePaxosInstallConfiguration.class)
 @JsonSerialize(as = ImmutablePaxosInstallConfiguration.class)
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosRuntimeConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosRuntimeConfiguration.java
index 9aad58453f2..77adf758de6 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosRuntimeConfiguration.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosRuntimeConfiguration.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.timelock.config;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Preconditions;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutablePaxosRuntimeConfiguration.class)
 @JsonSerialize(as = ImmutablePaxosRuntimeConfiguration.class)
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosTsBoundPersisterConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosTsBoundPersisterConfiguration.java
index 5e321f591b0..b36593ed508 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosTsBoundPersisterConfiguration.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosTsBoundPersisterConfiguration.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.timelock.config;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutablePaxosTsBoundPersisterConfiguration.class)
 @JsonSerialize(as = ImmutablePaxosTsBoundPersisterConfiguration.class)
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/config/TimeLockInstallConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/TimeLockInstallConfiguration.java
index aa603981f1f..755fa250b5c 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/config/TimeLockInstallConfiguration.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/config/TimeLockInstallConfiguration.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.timelock.config;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 /**
  * Static (not live-reloaded) portions of TimeLock's configuration.
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/config/TimeLockRuntimeConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/TimeLockRuntimeConfiguration.java
index b37e0ecd079..005c4bd6111 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/config/TimeLockRuntimeConfiguration.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/config/TimeLockRuntimeConfiguration.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.timelock.config;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.timelock.config.TargetedSweepLockControlConfig;
+import org.immutables.value.Value;
 
 /**
  * Dynamic (live-reloaded) portions of TimeLock's configuration.
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/AsyncTimeLockServicesCreator.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/AsyncTimeLockServicesCreator.java
index d43911f7b45..3888238541d 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/AsyncTimeLockServicesCreator.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/AsyncTimeLockServicesCreator.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.timelock.paxos;
 
-import java.util.Optional;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.InstrumentedScheduledExecutorService;
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.base.Suppliers;
@@ -46,6 +38,12 @@
 import com.palantir.timestamp.ManagedTimestampService;
 import com.palantir.tritium.metrics.registry.MetricName;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import java.util.Optional;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AsyncTimeLockServicesCreator implements TimeLockServicesCreator {
     private static final Logger log = LoggerFactory.getLogger(AsyncTimeLockServicesCreator.class);
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/ClientAwarePaxosAcceptor.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/ClientAwarePaxosAcceptor.java
index 5a7b4d02099..f8f2062b45d 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/ClientAwarePaxosAcceptor.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/ClientAwarePaxosAcceptor.java
@@ -16,19 +16,18 @@
 
 package com.palantir.timelock.paxos;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
 import com.palantir.atlasdb.timelock.paxos.PaxosTimeLockConstants;
 import com.palantir.paxos.BooleanPaxosResponse;
 import com.palantir.paxos.PaxosAcceptor;
 import com.palantir.paxos.PaxosPromise;
 import com.palantir.paxos.PaxosProposal;
 import com.palantir.paxos.PaxosProposalId;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
 
 /**
  * This interface is used internally to allow creating a single feign proxy where different clients can be injected
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/ClientAwarePaxosAcceptorAdapter.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/ClientAwarePaxosAcceptorAdapter.java
index 3ed71db4f6a..38ec5b2dc89 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/ClientAwarePaxosAcceptorAdapter.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/ClientAwarePaxosAcceptorAdapter.java
@@ -16,16 +16,15 @@
 
 package com.palantir.timelock.paxos;
 
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 import com.palantir.atlasdb.timelock.paxos.Client;
 import com.palantir.paxos.BooleanPaxosResponse;
 import com.palantir.paxos.PaxosAcceptor;
 import com.palantir.paxos.PaxosPromise;
 import com.palantir.paxos.PaxosProposal;
 import com.palantir.paxos.PaxosProposalId;
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 
 public final class ClientAwarePaxosAcceptorAdapter implements PaxosAcceptor {
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/ClientAwarePaxosLearner.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/ClientAwarePaxosLearner.java
index 692c6ef334b..820150b3016 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/ClientAwarePaxosLearner.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/ClientAwarePaxosLearner.java
@@ -16,8 +16,11 @@
 
 package com.palantir.timelock.paxos;
 
+import com.palantir.atlasdb.timelock.paxos.PaxosTimeLockConstants;
+import com.palantir.common.annotation.Inclusive;
+import com.palantir.paxos.PaxosLearner;
+import com.palantir.paxos.PaxosValue;
 import java.util.Collection;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.ws.rs.Consumes;
@@ -28,11 +31,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.atlasdb.timelock.paxos.PaxosTimeLockConstants;
-import com.palantir.common.annotation.Inclusive;
-import com.palantir.paxos.PaxosLearner;
-import com.palantir.paxos.PaxosValue;
-
 /**
  * This interface is used internally to allow creating a single feign proxy where different clients can be injected
  * using {@link ClientAwarePaxosLearner} to create {@link PaxosLearner}s instead of creating a proxy per client. This
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/ClientAwarePaxosLearnerAdapter.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/ClientAwarePaxosLearnerAdapter.java
index 7edea183693..cce4f929e68 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/ClientAwarePaxosLearnerAdapter.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/ClientAwarePaxosLearnerAdapter.java
@@ -16,18 +16,16 @@
 
 package com.palantir.timelock.paxos;
 
+import com.palantir.atlasdb.timelock.paxos.Client;
+import com.palantir.paxos.PaxosLearner;
+import com.palantir.paxos.PaxosValue;
 import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.palantir.atlasdb.timelock.paxos.Client;
-import com.palantir.paxos.PaxosLearner;
-import com.palantir.paxos.PaxosValue;
-
 public final class ClientAwarePaxosLearnerAdapter implements PaxosLearner {
     private final String client;
     private final ClientAwarePaxosLearner clientAwarePaxosLearner;
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/DbBoundTimestampCreator.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/DbBoundTimestampCreator.java
index 352e582b6f4..f2ced651d65 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/DbBoundTimestampCreator.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/DbBoundTimestampCreator.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.timelock.paxos;
 
-import java.util.Optional;
-import java.util.function.Supplier;
-
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.config.LeaderConfig;
@@ -32,6 +29,8 @@
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
 import com.palantir.tritium.metrics.registry.SharedTaggedMetricRegistries;
+import java.util.Optional;
+import java.util.function.Supplier;
 
 public class DbBoundTimestampCreator implements TimestampCreator {
 
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/LeaderPingHealthCheck.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/LeaderPingHealthCheck.java
index f7ad1a23452..323e501857e 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/LeaderPingHealthCheck.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/LeaderPingHealthCheck.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.timelock.paxos;
 
-import java.time.Duration;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.common.concurrent.NamedThreadFactory;
 import com.palantir.common.concurrent.PTExecutors;
@@ -27,6 +23,9 @@
 import com.palantir.paxos.PaxosResponse;
 import com.palantir.paxos.PaxosResponses;
 import com.palantir.timelock.TimeLockStatus;
+import java.time.Duration;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
 
 public class LeaderPingHealthCheck {
 
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/LockCreator.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/LockCreator.java
index bb2c538cfd7..803502e4da8 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/LockCreator.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/LockCreator.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.timelock.paxos;
 
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Semaphore;
-import java.util.function.Supplier;
-
 import com.palantir.atlasdb.timelock.lock.BlockingTimeLimitedLockService;
 import com.palantir.common.concurrent.NamedThreadFactory;
 import com.palantir.common.concurrent.PTExecutors;
@@ -27,6 +23,9 @@
 import com.palantir.lock.impl.LockServiceImpl;
 import com.palantir.lock.impl.ThreadPooledLockService;
 import com.palantir.timelock.config.TimeLockRuntimeConfiguration;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Semaphore;
+import java.util.function.Supplier;
 
 public class LockCreator {
     private final Supplier runtime;
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosLeadershipCreator.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosLeadershipCreator.java
index 99def825160..7821ec79c08 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosLeadershipCreator.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosLeadershipCreator.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.timelock.paxos;
 
-import java.nio.file.Paths;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
 import com.google.common.base.Suppliers;
 import com.palantir.atlasdb.config.ImmutableLeaderConfig;
 import com.palantir.atlasdb.config.ImmutableLeaderRuntimeConfig;
@@ -39,6 +33,11 @@
 import com.palantir.timelock.config.PaxosRuntimeConfiguration;
 import com.palantir.timelock.config.TimeLockInstallConfiguration;
 import com.palantir.timelock.config.TimeLockRuntimeConfiguration;
+import java.nio.file.Paths;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
 
 class PaxosLeadershipCreator {
     private final MetricsManager metricsManager;
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosRemotingUtils.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosRemotingUtils.java
index 6713f115f31..7065f5707da 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosRemotingUtils.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosRemotingUtils.java
@@ -15,16 +15,15 @@
  */
 package com.palantir.timelock.paxos;
 
-import java.util.Collection;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
 import com.palantir.timelock.config.ClusterConfiguration;
 import com.palantir.timelock.config.TimeLockInstallConfiguration;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 public final class PaxosRemotingUtils {
     private PaxosRemotingUtils() {
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosTimestampCreator.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosTimestampCreator.java
index 1c7fa473ce1..74391de69bb 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosTimestampCreator.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosTimestampCreator.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.timelock.paxos;
 
-import java.util.UUID;
-import java.util.function.Supplier;
-
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.timelock.paxos.Client;
@@ -33,6 +30,8 @@
 import com.palantir.timestamp.ManagedTimestampService;
 import com.palantir.timestamp.PersistentTimestampServiceImpl;
 import com.palantir.timestamp.TimestampBoundStore;
+import java.util.UUID;
+import java.util.function.Supplier;
 
 public class PaxosTimestampCreator implements TimestampCreator {
     private final MetricRegistry metricRegistry;
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimeLockAgent.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimeLockAgent.java
index 6444dc62920..019a4f45ff8 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimeLockAgent.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimeLockAgent.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.timelock.paxos;
 
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
 import com.codahale.metrics.InstrumentedExecutorService;
 import com.codahale.metrics.InstrumentedThreadFactory;
 import com.codahale.metrics.MetricRegistry;
@@ -47,6 +42,10 @@
 import com.palantir.timelock.config.TimeLockRuntimeConfiguration;
 import com.palantir.timelock.config.TsBoundPersisterConfiguration;
 import com.palantir.timestamp.ManagedTimestampService;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 @SuppressWarnings("checkstyle:FinalClass") // This is mocked internally
 public class TimeLockAgent {
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimeLockServicesCreator.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimeLockServicesCreator.java
index dfccff915d8..78ec170d13e 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimeLockServicesCreator.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimeLockServicesCreator.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.timelock.paxos;
 
-import java.util.function.Supplier;
-
 import com.palantir.atlasdb.timelock.TimeLockServices;
 import com.palantir.lock.LockService;
 import com.palantir.timestamp.ManagedTimestampService;
+import java.util.function.Supplier;
 
 public interface TimeLockServicesCreator {
     /**
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimestampCreator.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimestampCreator.java
index 335008869cd..726e46e5dd2 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimestampCreator.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimestampCreator.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.timelock.paxos;
 
-import java.util.function.Supplier;
-
 import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.timelock.paxos.Client;
 import com.palantir.timestamp.ManagedTimestampService;
+import java.util.function.Supplier;
 
 public interface TimestampCreator {
     Supplier createTimestampService(Client client, LeaderConfig leaderConfig);
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/utils/KubernetesHostnames.java b/timelock-agent/src/main/java/com/palantir/timelock/utils/KubernetesHostnames.java
index 6fa32130320..3503cf3c18c 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/utils/KubernetesHostnames.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/utils/KubernetesHostnames.java
@@ -15,6 +15,9 @@
  */
 package com.palantir.timelock.utils;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.palantir.logsafe.SafeArg;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.List;
@@ -23,14 +26,9 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.palantir.logsafe.SafeArg;
-
 public final class KubernetesHostnames {
 
     public static final KubernetesHostnames INSTANCE = new KubernetesHostnames(() -> {
diff --git a/timelock-agent/src/test/java/com/palantir/timelock/config/ClusterConfigurationDeserializationTest.java b/timelock-agent/src/test/java/com/palantir/timelock/config/ClusterConfigurationDeserializationTest.java
index af59a29a84f..218c071f6d8 100644
--- a/timelock-agent/src/test/java/com/palantir/timelock/config/ClusterConfigurationDeserializationTest.java
+++ b/timelock-agent/src/test/java/com/palantir/timelock/config/ClusterConfigurationDeserializationTest.java
@@ -18,20 +18,18 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
+import com.google.common.collect.ImmutableSet;
 import java.io.File;
 import java.io.IOException;
 import java.util.Set;
-
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
-import com.google.common.collect.ImmutableSet;
-
 public class ClusterConfigurationDeserializationTest {
     private static final String LOCAL_SERVER = "https://server-2:8421";
     private static final Set SERVERS = ImmutableSet.of(
diff --git a/timelock-agent/src/test/java/com/palantir/timelock/config/DefaultClusterConfigurationTest.java b/timelock-agent/src/test/java/com/palantir/timelock/config/DefaultClusterConfigurationTest.java
index dbf1b657b7b..dda5be95f16 100644
--- a/timelock-agent/src/test/java/com/palantir/timelock/config/DefaultClusterConfigurationTest.java
+++ b/timelock-agent/src/test/java/com/palantir/timelock/config/DefaultClusterConfigurationTest.java
@@ -17,12 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.util.Optional;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.conjure.java.api.config.service.PartialServiceConfiguration;
+import java.util.Optional;
+import org.junit.Test;
 
 public class DefaultClusterConfigurationTest {
     private static final String ADDRESS_1 = "localhost:1";
diff --git a/timelock-agent/src/test/java/com/palantir/timelock/config/PaxosInstallConfigurationTest.java b/timelock-agent/src/test/java/com/palantir/timelock/config/PaxosInstallConfigurationTest.java
index a76df0adce6..e9e1e162884 100644
--- a/timelock-agent/src/test/java/com/palantir/timelock/config/PaxosInstallConfigurationTest.java
+++ b/timelock-agent/src/test/java/com/palantir/timelock/config/PaxosInstallConfigurationTest.java
@@ -23,7 +23,6 @@
 import static org.mockito.Mockito.when;
 
 import java.io.File;
-
 import org.junit.Test;
 
 public class PaxosInstallConfigurationTest {
diff --git a/timelock-agent/src/test/java/com/palantir/timelock/paxos/LeaderPingHealthCheckTest.java b/timelock-agent/src/test/java/com/palantir/timelock/paxos/LeaderPingHealthCheckTest.java
index 7c47d43fc9f..0ed6a008ef1 100644
--- a/timelock-agent/src/test/java/com/palantir/timelock/paxos/LeaderPingHealthCheckTest.java
+++ b/timelock-agent/src/test/java/com/palantir/timelock/paxos/LeaderPingHealthCheckTest.java
@@ -19,12 +19,11 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.http.errors.AtlasDbRemoteException;
 import com.palantir.leader.PingableLeader;
 import com.palantir.timelock.TimeLockStatus;
+import org.junit.Test;
 
 public class LeaderPingHealthCheckTest {
 
diff --git a/timelock-agent/src/test/java/com/palantir/timelock/paxos/PaxosRemotingUtilsTest.java b/timelock-agent/src/test/java/com/palantir/timelock/paxos/PaxosRemotingUtilsTest.java
index 95302143abc..80bad374153 100644
--- a/timelock-agent/src/test/java/com/palantir/timelock/paxos/PaxosRemotingUtilsTest.java
+++ b/timelock-agent/src/test/java/com/palantir/timelock/paxos/PaxosRemotingUtilsTest.java
@@ -19,12 +19,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.Optional;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
@@ -36,6 +30,10 @@
 import com.palantir.timelock.config.ImmutableTimeLockInstallConfiguration;
 import com.palantir.timelock.config.PaxosInstallConfiguration;
 import com.palantir.timelock.config.TimeLockInstallConfiguration;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Optional;
+import org.junit.Test;
 
 public class PaxosRemotingUtilsTest {
     private static final List CLUSTER_URIS = ImmutableList.of("foo:1", "bar:2", "baz:3");
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockResource.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockResource.java
index 3a7bab200ce..0d3c84d7894 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockResource.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockResource.java
@@ -15,18 +15,6 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import java.util.Set;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.MediaType;
-
 import com.palantir.atlasdb.timelock.lock.AsyncResult;
 import com.palantir.atlasdb.timelock.lock.Leased;
 import com.palantir.atlasdb.timelock.lock.LockLog;
@@ -48,6 +36,16 @@
 import com.palantir.lock.v2.WaitForLocksResponse;
 import com.palantir.logsafe.Safe;
 import com.palantir.timestamp.TimestampRange;
+import java.util.Set;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.container.AsyncResponse;
+import javax.ws.rs.container.Suspended;
+import javax.ws.rs.core.MediaType;
 
 @Path("/timelock")
 @Consumes(MediaType.APPLICATION_JSON)
@@ -111,7 +109,7 @@ public StartAtlasDbTransactionResponseV3 deprecatedStartTransactionV3(
     public StartTransactionResponseV4 startTransactions(StartTransactionRequestV4 request) {
         return timelock.startTransactions(request);
     }
-    
+
     @POST
     @Path("immutable-timestamp")
     public long getImmutableTimestamp() {
@@ -133,7 +131,7 @@ public void deprecatedLock(@Suspended final AsyncResponse response, IdentifiedLo
             }
         });
     }
-    
+
     @POST
     @Path("lock-v2")
     public void lock(@Suspended final AsyncResponse response, IdentifiedLockRequest request) {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockService.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockService.java
index 6b6c6503fb8..e705257242b 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockService.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockService.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import java.io.Closeable;
-import java.util.Set;
-
 import com.palantir.atlasdb.timelock.lock.AsyncResult;
 import com.palantir.atlasdb.timelock.lock.Leased;
 import com.palantir.lock.client.IdentifiedLockRequest;
@@ -33,6 +30,8 @@
 import com.palantir.lock.v2.StartTransactionResponseV4;
 import com.palantir.lock.v2.WaitForLocksRequest;
 import com.palantir.timestamp.ManagedTimestampService;
+import java.io.Closeable;
+import java.util.Set;
 
 public interface AsyncTimelockService extends ManagedTimestampService, Closeable {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceImpl.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceImpl.java
index 673451416ed..5193220faad 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceImpl.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceImpl.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import java.util.Set;
-import java.util.UUID;
-
 import com.palantir.atlasdb.timelock.lock.AsyncLockService;
 import com.palantir.atlasdb.timelock.lock.AsyncResult;
 import com.palantir.atlasdb.timelock.lock.Leased;
@@ -40,6 +37,8 @@
 import com.palantir.lock.v2.WaitForLocksRequest;
 import com.palantir.timestamp.ManagedTimestampService;
 import com.palantir.timestamp.TimestampRange;
+import java.util.Set;
+import java.util.UUID;
 
 public class AsyncTimelockServiceImpl implements AsyncTimelockService {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TimeLockResource.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TimeLockResource.java
index 8464d76d5cb..afac05ba08a 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TimeLockResource.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TimeLockResource.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import java.util.concurrent.ConcurrentMap;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
@@ -36,6 +26,13 @@
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Path("/{namespace: [a-zA-Z0-9_-]+}")
 public class TimeLockResource {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TimeLockServices.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TimeLockServices.java
index c5f3800684a..e63b9d9bb95 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TimeLockServices.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TimeLockServices.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import org.immutables.value.Value;
-
 import com.palantir.lock.LockService;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public interface TimeLockServices {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TooManyRequestsExceptionMapper.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TooManyRequestsExceptionMapper.java
index c899ac9bd5b..b35c0781b7a 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TooManyRequestsExceptionMapper.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TooManyRequestsExceptionMapper.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-
 import com.palantir.atlasdb.http.ExceptionMappers;
 import com.palantir.lock.impl.TooManyRequestsException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
 
 public class TooManyRequestsExceptionMapper implements ExceptionMapper {
     public static final int TOO_MANY_REQUESTS_429 = 429;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/BCryptedSecret.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/BCryptedSecret.java
index 0837c42d46d..b5256881b48 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/BCryptedSecret.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/BCryptedSecret.java
@@ -16,13 +16,12 @@
 
 package com.palantir.atlasdb.timelock.auth.api;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import org.immutables.value.Value;
 import org.mindrot.jbcrypt.BCrypt;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-
 @Value.Immutable
 public abstract class BCryptedSecret {
     private static final Logger log = LoggerFactory.getLogger(BCryptedSecret.class);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/ClientId.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/ClientId.java
index 8f004c8560f..190f707bda9 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/ClientId.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/ClientId.java
@@ -16,11 +16,10 @@
 
 package com.palantir.atlasdb.timelock.auth.api;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableClientId.class)
 @JsonDeserialize(as = ImmutableClientId.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/Credentials.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/Credentials.java
index 2085d85135b..41e1ab1b0fc 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/Credentials.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/Credentials.java
@@ -16,10 +16,9 @@
 
 package com.palantir.atlasdb.timelock.auth.api;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableCredentials.class)
 @JsonSerialize(as = ImmutableCredentials.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/AdminPrivilegesConfiguration.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/AdminPrivilegesConfiguration.java
index 2132a7bce28..3ff4c811643 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/AdminPrivilegesConfiguration.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/AdminPrivilegesConfiguration.java
@@ -16,14 +16,13 @@
 
 package com.palantir.atlasdb.timelock.auth.config;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.atlasdb.timelock.auth.api.ClientId;
 import com.palantir.atlasdb.timelock.auth.api.Privileges;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableAdminPrivilegesConfiguration.class)
 @JsonDeserialize(as = ImmutableAdminPrivilegesConfiguration.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/ClientPrivilegesConfiguration.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/ClientPrivilegesConfiguration.java
index 5eae258cb93..d55cb19003e 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/ClientPrivilegesConfiguration.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/ClientPrivilegesConfiguration.java
@@ -16,10 +16,6 @@
 
 package com.palantir.atlasdb.timelock.auth.config;
 
-import java.util.Set;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -27,6 +23,8 @@
 import com.palantir.atlasdb.timelock.auth.api.ClientId;
 import com.palantir.atlasdb.timelock.auth.api.Privileges;
 import com.palantir.lock.TimelockNamespace;
+import java.util.Set;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableClientPrivilegesConfiguration.class)
 @JsonDeserialize(as = ImmutableClientPrivilegesConfiguration.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/NamespacePrivileges.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/NamespacePrivileges.java
index 8669222be4f..c86cd77d958 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/NamespacePrivileges.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/NamespacePrivileges.java
@@ -16,12 +16,10 @@
 
 package com.palantir.atlasdb.timelock.auth.config;
 
-import java.util.Set;
-
-import org.immutables.value.Value;
-
 import com.palantir.atlasdb.timelock.auth.api.Privileges;
 import com.palantir.lock.TimelockNamespace;
+import java.util.Set;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class NamespacePrivileges implements Privileges {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/TimelockAuthConfiguration.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/TimelockAuthConfiguration.java
index 2aba3522360..6a9faf57c0e 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/TimelockAuthConfiguration.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/TimelockAuthConfiguration.java
@@ -16,14 +16,12 @@
 
 package com.palantir.atlasdb.timelock.auth.config;
 
-import java.util.List;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.atlasdb.timelock.auth.api.Credentials;
+import java.util.List;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableTimelockAuthConfiguration.class)
 @JsonDeserialize(as = ImmutableTimelockAuthConfiguration.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/CachingAuthenticator.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/CachingAuthenticator.java
index 2ea9af50b24..29d360f6f20 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/CachingAuthenticator.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/CachingAuthenticator.java
@@ -16,11 +16,6 @@
 
 package com.palantir.atlasdb.timelock.auth.impl;
 
-import java.util.Map;
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.common.collect.ImmutableMap;
@@ -29,6 +24,9 @@
 import com.palantir.atlasdb.timelock.auth.api.BCryptedSecret;
 import com.palantir.atlasdb.timelock.auth.api.ClientId;
 import com.palantir.atlasdb.timelock.auth.api.Password;
+import java.util.Map;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 public class CachingAuthenticator implements Authenticator {
     private final ImmutableMap credentials;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/NamespaceLocker.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/NamespaceLocker.java
index cb93e29ce51..e7e6c313188 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/NamespaceLocker.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/NamespaceLocker.java
@@ -16,11 +16,10 @@
 
 package com.palantir.atlasdb.timelock.auth.impl;
 
-import java.util.Map;
-
 import com.palantir.atlasdb.timelock.auth.api.ClientId;
 import com.palantir.atlasdb.timelock.auth.api.Privileges;
 import com.palantir.lock.TimelockNamespace;
+import java.util.Map;
 
 interface NamespaceLocker {
     NamespaceLocker ALL_LOCKED = ignored -> true;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/PrivilegeBasedNamespaceLocker.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/PrivilegeBasedNamespaceLocker.java
index 51eb59e2945..6e52c764121 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/PrivilegeBasedNamespaceLocker.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/PrivilegeBasedNamespaceLocker.java
@@ -16,13 +16,12 @@
 
 package com.palantir.atlasdb.timelock.auth.impl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import com.palantir.atlasdb.timelock.auth.api.ClientId;
 import com.palantir.atlasdb.timelock.auth.api.Privileges;
 import com.palantir.lock.TimelockNamespace;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 public class PrivilegeBasedNamespaceLocker implements NamespaceLocker {
     private List nonAdminPrivileges;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/SimpleAuthorizer.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/SimpleAuthorizer.java
index 3752a671409..df41f7554c6 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/SimpleAuthorizer.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/SimpleAuthorizer.java
@@ -16,15 +16,14 @@
 
 package com.palantir.atlasdb.timelock.auth.impl;
 
-import java.util.Map;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.timelock.auth.api.AuthenticatedClient;
+import com.palantir.atlasdb.timelock.auth.api.Authorizer;
 import com.palantir.atlasdb.timelock.auth.api.ClientId;
 import com.palantir.atlasdb.timelock.auth.api.Privileges;
 import com.palantir.lock.TimelockNamespace;
-import com.palantir.atlasdb.timelock.auth.api.Authorizer;
-import com.palantir.atlasdb.timelock.auth.api.AuthenticatedClient;
+import java.util.Map;
 
 public class SimpleAuthorizer implements Authorizer {
     private final Map privileges;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/ClusterConfiguration.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/ClusterConfiguration.java
index 6dbc02e5435..3f256cb3f68 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/ClusterConfiguration.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/ClusterConfiguration.java
@@ -15,17 +15,14 @@
  */
 package com.palantir.atlasdb.timelock.config;
 
-import java.util.Set;
-
-import javax.validation.constraints.Size;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.net.HostAndPort;
+import java.util.Set;
+import javax.validation.constraints.Size;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableClusterConfiguration.class)
 @JsonDeserialize(as = ImmutableClusterConfiguration.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/TargetedSweepLockControlConfig.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/TargetedSweepLockControlConfig.java
index 243867b652f..b16f04df28b 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/TargetedSweepLockControlConfig.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/TargetedSweepLockControlConfig.java
@@ -18,14 +18,12 @@
 
 import static com.palantir.atlasdb.timelock.lock.TargetedSweepLockDecorator.LOCK_ACQUIRES_PER_SECOND;
 
-import java.util.Map;
-import java.util.Set;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.Map;
+import java.util.Set;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonDeserialize(as = ImmutableTargetedSweepLockControlConfig.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/TimeLimiterConfiguration.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/TimeLimiterConfiguration.java
index 3f58f43a5d1..2e264c8e50a 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/TimeLimiterConfiguration.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/TimeLimiterConfiguration.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.timelock.config;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Preconditions;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableTimeLimiterConfiguration.class)
 @JsonDeserialize(as = ImmutableTimeLimiterConfiguration.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLock.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLock.java
index 5daa55a94f9..bc8b4504f2e 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLock.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLock.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.UUID;
-
 import com.palantir.lock.LockDescriptor;
+import java.util.UUID;
 
 public interface AsyncLock {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLockService.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLockService.java
index fcdc7bc03de..1126cdbf28d 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLockService.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLockService.java
@@ -15,6 +15,13 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableSet;
+import com.palantir.atlasdb.timelock.config.TargetedSweepLockControlConfig.RateLimitConfig;
+import com.palantir.lock.LockDescriptor;
+import com.palantir.lock.v2.LeaderTime;
+import com.palantir.lock.v2.LockToken;
+import com.palantir.lock.v2.RefreshLockResponseV2;
 import java.io.Closeable;
 import java.util.Optional;
 import java.util.Set;
@@ -22,18 +29,9 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableSet;
-import com.palantir.atlasdb.timelock.config.TargetedSweepLockControlConfig.RateLimitConfig;
-import com.palantir.lock.LockDescriptor;
-import com.palantir.lock.v2.LeaderTime;
-import com.palantir.lock.v2.LockToken;
-import com.palantir.lock.v2.RefreshLockResponseV2;
-
 public class AsyncLockService implements Closeable {
 
     private static final Logger log = LoggerFactory.getLogger(AsyncLockService.class);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncResult.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncResult.java
index 2e235bacded..bf1a7cef32a 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncResult.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncResult.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
+import com.palantir.logsafe.Preconditions;
+import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
-
-import com.palantir.logsafe.Preconditions;
-import com.palantir.logsafe.exceptions.SafeIllegalStateException;
-
 import net.jcip.annotations.ThreadSafe;
 
 @ThreadSafe
@@ -184,6 +182,7 @@ public void onComplete(Runnable completionHandler) {
         future.whenComplete((result, error) -> completionHandler.run());
     }
 
+    @SuppressWarnings("DangerousCompletableFutureUsage")
     public void onCompleteAsync(Runnable completionHandler) {
         future.whenCompleteAsync((result, error) -> completionHandler.run());
     }
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AwaitedLocksCollection.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AwaitedLocksCollection.java
index 2a2a13d98f1..6d25c11f242 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AwaitedLocksCollection.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AwaitedLocksCollection.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Maps;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentMap;
 import java.util.function.Supplier;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Maps;
-
 // TODO(nziebart): can we combine this logic with HeldLocksCollection?
 // Or, should awaitLocks just be implemented by a lock + unlock?
 public class AwaitedLocksCollection {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/BlockingTimeLimitedLockService.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/BlockingTimeLimitedLockService.java
index b919bd9ff9a..cbb55908124 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/BlockingTimeLimitedLockService.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/BlockingTimeLimitedLockService.java
@@ -15,20 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import javax.annotation.Nullable;
-import javax.ws.rs.PathParam;
-
-import org.immutables.value.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
 import com.google.common.util.concurrent.SimpleTimeLimiter;
@@ -46,6 +32,17 @@
 import com.palantir.lock.remoting.BlockingTimeoutException;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import javax.annotation.Nullable;
+import javax.ws.rs.PathParam;
+import org.immutables.value.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class BlockingTimeLimitedLockService implements CloseableLockService {
     private static final Logger log = LoggerFactory.getLogger(BlockingTimeLimitedLockService.class);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ExclusiveLock.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ExclusiveLock.java
index 174b84e901c..fb0b086f210 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ExclusiveLock.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ExclusiveLock.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.LinkedHashMap;
-import java.util.Objects;
-import java.util.UUID;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.timelock.util.LoggableIllegalStateException;
 import com.palantir.lock.LockDescriptor;
 import com.palantir.logsafe.SafeArg;
+import java.util.LinkedHashMap;
+import java.util.Objects;
+import java.util.UUID;
+import javax.annotation.concurrent.GuardedBy;
+import javax.annotation.concurrent.NotThreadSafe;
 
 public class ExclusiveLock implements AsyncLock {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/HeldLocks.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/HeldLocks.java
index aa654d72249..9c38d73be25 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/HeldLocks.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/HeldLocks.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.Collection;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-import javax.annotation.concurrent.GuardedBy;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.common.time.NanoTime;
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.v2.LockToken;
+import java.util.Collection;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import javax.annotation.concurrent.GuardedBy;
 
 public class HeldLocks {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/HeldLocksCollection.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/HeldLocksCollection.java
index 9e914cfd082..58ba0e376e1 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/HeldLocksCollection.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/HeldLocksCollection.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.Iterator;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentMap;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -30,6 +23,12 @@
 import com.palantir.lock.v2.LeaderTime;
 import com.palantir.lock.v2.Lease;
 import com.palantir.lock.v2.LockToken;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
 
 public class HeldLocksCollection {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampLock.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampLock.java
index 735638423cf..1cedf28cd2f 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampLock.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampLock.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.UUID;
-
-import javax.ws.rs.NotSupportedException;
-
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.StringLockDescriptor;
+import java.util.UUID;
+import javax.ws.rs.NotSupportedException;
 
 public class ImmutableTimestampLock implements AsyncLock {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampTracker.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampTracker.java
index 13749505bd2..597f664e513 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampTracker.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampTracker.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.Optional;
-import java.util.SortedMap;
-import java.util.UUID;
-
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.timelock.util.LoggableIllegalStateException;
 import com.palantir.logsafe.SafeArg;
-
+import java.util.Optional;
+import java.util.SortedMap;
+import java.util.UUID;
 import net.jcip.annotations.GuardedBy;
 
 public class ImmutableTimestampTracker {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LeaderClock.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LeaderClock.java
index 3cd89d3af42..1562a18c6a0 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LeaderClock.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LeaderClock.java
@@ -16,12 +16,11 @@
 
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.function.Supplier;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.common.time.NanoTime;
 import com.palantir.lock.v2.LeaderTime;
 import com.palantir.lock.v2.LeadershipId;
+import java.util.function.Supplier;
 
 public class LeaderClock {
     private final LeadershipId leadershipId;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LeaseExpirationTimer.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LeaseExpirationTimer.java
index f85573b6c70..c54c5520e99 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LeaseExpirationTimer.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LeaseExpirationTimer.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.function.Supplier;
-
 import com.palantir.common.time.NanoTime;
+import java.util.function.Supplier;
 
 public class LeaseExpirationTimer {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockAcquirer.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockAcquirer.java
index d6785404d0d..c10c74c889b 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockAcquirer.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockAcquirer.java
@@ -15,17 +15,15 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
+import com.google.common.base.Throwables;
+import com.palantir.logsafe.SafeArg;
 import java.util.UUID;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Throwables;
-import com.palantir.logsafe.SafeArg;
-
 public class LockAcquirer implements AutoCloseable {
 
     private static final Logger log = LoggerFactory.getLogger(LockAcquirer.class);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockCollection.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockCollection.java
index e9a9f797895..f80eaa532a9 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockCollection.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockCollection.java
@@ -16,14 +16,13 @@
 package com.palantir.atlasdb.timelock.lock;
 
 
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
-
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.common.collect.Lists;
 import com.palantir.lock.LockDescriptor;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
 
 public class LockCollection {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockEvents.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockEvents.java
index a35147ff0bc..d0a6ce077ca 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockEvents.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockEvents.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.Collection;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-import org.immutables.value.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
@@ -33,6 +24,13 @@
 import com.palantir.lock.v2.WaitForLocksRequest;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import java.util.Collection;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import org.immutables.value.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class LockEvents {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockLog.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockLog.java
index 2113cdeb858..67358a5eb6e 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockLog.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockLog.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.Collection;
-import java.util.UUID;
-import java.util.function.Supplier;
-
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.atlasdb.timelock.lock.LockEvents.RequestInfo;
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.client.IdentifiedLockRequest;
 import com.palantir.lock.v2.WaitForLocksRequest;
+import java.util.Collection;
+import java.util.UUID;
+import java.util.function.Supplier;
 
 public final class LockLog {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/NonTransactionalLockService.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/NonTransactionalLockService.java
index bb8034a61db..b222988ee43 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/NonTransactionalLockService.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/NonTransactionalLockService.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import javax.ws.rs.BadRequestException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.lock.LockService;
 import com.palantir.lock.SimplifyingLockService;
 import com.palantir.logsafe.UnsafeArg;
+import javax.ws.rs.BadRequestException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This lock service may be used as a LockService, for the purposes of advisory locking as well as for
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/OrderedLocks.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/OrderedLocks.java
index 4cd358ac8b0..816baab9208 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/OrderedLocks.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/OrderedLocks.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
+import com.google.common.collect.ImmutableList;
 import java.util.List;
-
 import org.immutables.value.Value;
 
-import com.google.common.collect.ImmutableList;
-
 @Value.Immutable
 public interface OrderedLocks {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/OrderedLocksDecorator.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/OrderedLocksDecorator.java
index 6fe362d0369..c5e48124cc0 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/OrderedLocksDecorator.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/OrderedLocksDecorator.java
@@ -16,9 +16,8 @@
 
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.List;
-
 import com.palantir.lock.LockDescriptor;
+import java.util.List;
 
 public interface OrderedLocksDecorator {
     OrderedLocksDecorator DO_NOTHING = (descriptors, locks) -> OrderedLocks.fromOrderedList(locks);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/TargetedSweepAsyncLock.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/TargetedSweepAsyncLock.java
index 7884a275df8..4532d793f60 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/TargetedSweepAsyncLock.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/TargetedSweepAsyncLock.java
@@ -16,18 +16,16 @@
 
 package com.palantir.atlasdb.timelock.lock;
 
+import com.google.common.util.concurrent.RateLimiter;
+import com.palantir.lock.LockDescriptor;
+import com.palantir.logsafe.SafeArg;
 import java.util.UUID;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BooleanSupplier;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.util.concurrent.RateLimiter;
-import com.palantir.lock.LockDescriptor;
-import com.palantir.logsafe.SafeArg;
-
 public class TargetedSweepAsyncLock implements AsyncLock {
 
     private static final Logger log = LoggerFactory.getLogger(TargetedSweepAsyncLock.class);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/TargetedSweepLockDecorator.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/TargetedSweepLockDecorator.java
index 6845ff2fa2b..1f717b5c80d 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/TargetedSweepLockDecorator.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/TargetedSweepLockDecorator.java
@@ -16,14 +16,6 @@
 
 package com.palantir.atlasdb.timelock.lock;
 
-import java.io.Closeable;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.function.Supplier;
-
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.common.annotations.VisibleForTesting;
@@ -39,6 +31,13 @@
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.StringLockDescriptor;
 import com.palantir.util.Pair;
+import java.io.Closeable;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.function.Supplier;
 
 public final class TargetedSweepLockDecorator implements OrderedLocksDecorator, Closeable {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptCoalescingFunction.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptCoalescingFunction.java
index d5ba04e0699..690a7bc9a98 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptCoalescingFunction.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptCoalescingFunction.java
@@ -16,15 +16,14 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.SetMultimap;
 import com.palantir.atlasdb.autobatch.CoalescingRequestFunction;
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.paxos.BooleanPaxosResponse;
 import com.palantir.paxos.PaxosProposal;
+import java.util.Map;
+import java.util.Set;
 
 final class AcceptCoalescingFunction implements
         CoalescingRequestFunction, BooleanPaxosResponse> {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheDigest.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheDigest.java
index e417c76de64..02e43f77a5c 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheDigest.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheDigest.java
@@ -16,12 +16,10 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.Map;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.Map;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonDeserialize(as = ImmutableAcceptorCacheDigest.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheImpl.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheImpl.java
index 16ec7c07e4e..881c03a192c 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheImpl.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheImpl.java
@@ -16,6 +16,11 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.google.common.collect.Maps;
+import com.google.common.collect.TreeMultimap;
+import com.palantir.common.streams.KeyedStream;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.Comparator;
@@ -26,16 +31,9 @@
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.stream.Collectors;
-
 import javax.annotation.Nonnull;
 import javax.annotation.concurrent.GuardedBy;
 
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.google.common.collect.Maps;
-import com.google.common.collect.TreeMultimap;
-import com.palantir.common.streams.KeyedStream;
-
 public class AcceptorCacheImpl implements AcceptorCache {
 
     private final ReadWriteLock lock = new ReentrantReadWriteLock();
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheKey.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheKey.java
index 29b3080a72b..ba646ac316e 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheKey.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheKey.java
@@ -16,13 +16,11 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonDeserialize(as = ImmutableAcceptorCacheKey.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatcherExecutionExceptions.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatcherExecutionExceptions.java
index 8174aada339..624e31e598c 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatcherExecutionExceptions.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatcherExecutionExceptions.java
@@ -16,9 +16,8 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.concurrent.ExecutionException;
-
 import com.palantir.logsafe.Preconditions;
+import java.util.concurrent.ExecutionException;
 
 class AutobatcherExecutionExceptions {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPaxosAcceptorNetworkClientFactory.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPaxosAcceptorNetworkClientFactory.java
index 3b6e2455320..c90c12c8432 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPaxosAcceptorNetworkClientFactory.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPaxosAcceptorNetworkClientFactory.java
@@ -18,12 +18,6 @@
 
 import static com.palantir.atlasdb.timelock.paxos.PaxosQuorumCheckingCoalescingFunction.wrap;
 
-import java.io.Closeable;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.autobatch.Autobatchers;
 import com.palantir.atlasdb.autobatch.DisruptorAutobatcher;
@@ -35,6 +29,11 @@
 import com.palantir.paxos.PaxosProposal;
 import com.palantir.paxos.PaxosProposalId;
 import com.palantir.paxos.PaxosResponses;
+import java.io.Closeable;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
 
 public class AutobatchingPaxosAcceptorNetworkClientFactory implements Closeable {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPaxosLearnerNetworkClientFactory.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPaxosLearnerNetworkClientFactory.java
index 9ec12fb878f..0f28fbb211a 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPaxosLearnerNetworkClientFactory.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPaxosLearnerNetworkClientFactory.java
@@ -18,14 +18,6 @@
 
 import static com.palantir.atlasdb.timelock.paxos.PaxosQuorumCheckingCoalescingFunction.wrap;
 
-import java.io.Closeable;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Function;
-
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.autobatch.Autobatchers;
 import com.palantir.atlasdb.autobatch.DisruptorAutobatcher;
@@ -36,6 +28,13 @@
 import com.palantir.paxos.PaxosResponses;
 import com.palantir.paxos.PaxosUpdate;
 import com.palantir.paxos.PaxosValue;
+import java.io.Closeable;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Function;
 
 public class AutobatchingPaxosLearnerNetworkClientFactory implements Closeable {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPingableLeaderFactory.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPingableLeaderFactory.java
index 84983268d1c..14f2fbe4bf9 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPingableLeaderFactory.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPingableLeaderFactory.java
@@ -16,14 +16,13 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.io.Closeable;
-import java.util.UUID;
-import java.util.concurrent.ExecutionException;
-
 import com.palantir.atlasdb.autobatch.Autobatchers;
 import com.palantir.atlasdb.autobatch.Autobatchers.SupplierKey;
 import com.palantir.atlasdb.autobatch.DisruptorAutobatcher;
 import com.palantir.leader.PingableLeader;
+import java.io.Closeable;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
 
 public class AutobatchingPingableLeaderFactory implements Closeable {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptor.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptor.java
index 83e7e06831b..314db9661fc 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptor.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptor.java
@@ -16,15 +16,14 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.Optional;
-import java.util.Set;
-
 import com.google.common.collect.SetMultimap;
 import com.palantir.paxos.BooleanPaxosResponse;
 import com.palantir.paxos.PaxosAcceptor;
 import com.palantir.paxos.PaxosPromise;
 import com.palantir.paxos.PaxosProposal;
 import com.palantir.paxos.PaxosProposalId;
+import java.util.Optional;
+import java.util.Set;
 
 public interface BatchPaxosAcceptor {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorResource.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorResource.java
index ac156679bb9..2f3735aa60b 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorResource.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorResource.java
@@ -18,9 +18,15 @@
 
 import static com.palantir.atlasdb.timelock.paxos.BatchPaxosAcceptorRpcClient.CACHE_KEY_NOT_FOUND;
 
+import com.google.common.collect.SetMultimap;
+import com.palantir.conjure.java.api.errors.ServiceException;
+import com.palantir.logsafe.SafeArg;
+import com.palantir.paxos.BooleanPaxosResponse;
+import com.palantir.paxos.PaxosPromise;
+import com.palantir.paxos.PaxosProposal;
+import com.palantir.paxos.PaxosProposalId;
 import java.util.Optional;
 import java.util.Set;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -28,18 +34,9 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.SetMultimap;
-import com.palantir.conjure.java.api.errors.ServiceException;
-import com.palantir.logsafe.SafeArg;
-import com.palantir.paxos.BooleanPaxosResponse;
-import com.palantir.paxos.PaxosPromise;
-import com.palantir.paxos.PaxosProposal;
-import com.palantir.paxos.PaxosProposalId;
-
 @Path("/" + PaxosTimeLockConstants.BATCH_INTERNAL_NAMESPACE
         + "/acceptor")
 public class BatchPaxosAcceptorResource {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorRpcClient.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorRpcClient.java
index 4c85ec51463..5da4afd54bf 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorRpcClient.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorRpcClient.java
@@ -16,9 +16,15 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.google.common.collect.SetMultimap;
+import com.palantir.conjure.java.api.errors.ErrorType;
+import com.palantir.paxos.BooleanPaxosResponse;
+import com.palantir.paxos.PaxosAcceptor;
+import com.palantir.paxos.PaxosPromise;
+import com.palantir.paxos.PaxosProposal;
+import com.palantir.paxos.PaxosProposalId;
 import java.util.Optional;
 import java.util.Set;
-
 import javax.annotation.Nullable;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
@@ -29,14 +35,6 @@
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 
-import com.google.common.collect.SetMultimap;
-import com.palantir.conjure.java.api.errors.ErrorType;
-import com.palantir.paxos.BooleanPaxosResponse;
-import com.palantir.paxos.PaxosAcceptor;
-import com.palantir.paxos.PaxosPromise;
-import com.palantir.paxos.PaxosProposal;
-import com.palantir.paxos.PaxosProposalId;
-
 @Path("/" + PaxosTimeLockConstants.INTERNAL_NAMESPACE
         + "/{useCase}"
         + "/" + PaxosTimeLockConstants.BATCH_INTERNAL_NAMESPACE
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearner.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearner.java
index 310c1b5779f..27ba1f5391d 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearner.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearner.java
@@ -16,12 +16,11 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.collect.SetMultimap;
 import com.palantir.paxos.PaxosLearner;
 import com.palantir.paxos.PaxosValue;
+import java.util.Map;
+import java.util.Set;
 
 public interface BatchPaxosLearner {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerResource.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerResource.java
index ebea724d969..2573e7b6678 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerResource.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerResource.java
@@ -16,21 +16,19 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.google.common.collect.SetMultimap;
+import com.palantir.common.streams.KeyedStream;
+import com.palantir.paxos.PaxosValue;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.google.common.collect.SetMultimap;
-import com.palantir.common.streams.KeyedStream;
-import com.palantir.paxos.PaxosValue;
-
 @Path("/" + PaxosTimeLockConstants.BATCH_INTERNAL_NAMESPACE
         + "/learner")
 public class BatchPaxosLearnerResource implements BatchPaxosLearner {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerRpcClient.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerRpcClient.java
index e57990ff41c..d1ad45bc262 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerRpcClient.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerRpcClient.java
@@ -16,9 +16,11 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.google.common.collect.SetMultimap;
+import com.palantir.paxos.PaxosLearner;
+import com.palantir.paxos.PaxosValue;
 import java.util.Map;
 import java.util.Set;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -26,10 +28,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.google.common.collect.SetMultimap;
-import com.palantir.paxos.PaxosLearner;
-import com.palantir.paxos.PaxosValue;
-
 @Path("/" + PaxosTimeLockConstants.INTERNAL_NAMESPACE
         + "/{useCase}"
         + "/" + PaxosTimeLockConstants.BATCH_INTERNAL_NAMESPACE
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeader.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeader.java
index 2c28623a949..4da439907b4 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeader.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeader.java
@@ -16,17 +16,15 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.palantir.leader.PingableLeader;
 import java.util.Set;
 import java.util.UUID;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.leader.PingableLeader;
-
 @Path("/batch/leader")
 public interface BatchPingableLeader {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeaderResource.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeaderResource.java
index 8ee398ee8e9..d82fffe2f70 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeaderResource.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeaderResource.java
@@ -16,15 +16,14 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.palantir.common.streams.KeyedStream;
+import com.palantir.paxos.PaxosLearner;
+import com.palantir.paxos.PaxosValue;
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-import com.palantir.common.streams.KeyedStream;
-import com.palantir.paxos.PaxosLearner;
-import com.palantir.paxos.PaxosValue;
-
 public class BatchPingableLeaderResource implements BatchPingableLeader {
 
     private final UUID leadershipUuid;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchingPaxosLatestSequenceCache.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchingPaxosLatestSequenceCache.java
index 675c6bd2ff5..181b8945034 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchingPaxosLatestSequenceCache.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchingPaxosLatestSequenceCache.java
@@ -16,23 +16,20 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.palantir.atlasdb.autobatch.CoalescingRequestFunction;
+import com.palantir.common.streams.KeyedStream;
+import com.palantir.paxos.PaxosLong;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.NotThreadSafe;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.palantir.atlasdb.autobatch.CoalescingRequestFunction;
-import com.palantir.common.streams.KeyedStream;
-import com.palantir.paxos.PaxosLong;
-
 /*
     This is not thread safe, but it is okay because it is run within an autobatcher, which is configured to not process
     multiple batches in parallel.
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/Client.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/Client.java
index e9d962ae1cb..938183e8e00 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/Client.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/Client.java
@@ -16,16 +16,14 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.BitSet;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
+import java.util.BitSet;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonDeserialize(as = ImmutableClient.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/DelegatingManagedTimestampService.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/DelegatingManagedTimestampService.java
index c3afea94e93..e717eb6e52a 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/DelegatingManagedTimestampService.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/DelegatingManagedTimestampService.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.timelock.paxos;
 
-import javax.ws.rs.QueryParam;
-
 import com.palantir.logsafe.Preconditions;
 import com.palantir.timestamp.ManagedTimestampService;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampRange;
 import com.palantir.timestamp.TimestampService;
+import javax.ws.rs.QueryParam;
 
 public class DelegatingManagedTimestampService implements ManagedTimestampService {
     private final TimestampService timestampService;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/InvalidAcceptorCacheKeyException.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/InvalidAcceptorCacheKeyException.java
index 4eefca8ce4c..8c5c77120ac 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/InvalidAcceptorCacheKeyException.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/InvalidAcceptorCacheKeyException.java
@@ -16,12 +16,11 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.List;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.logsafe.Arg;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.SafeLoggable;
+import java.util.List;
 
 public class InvalidAcceptorCacheKeyException extends Exception implements SafeLoggable {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LeadershipResource.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LeadershipResource.java
index 09f4e8f4b57..d2f8806a748 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LeadershipResource.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LeadershipResource.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.timelock.paxos;
 
-import javax.ws.rs.Path;
-
 import com.palantir.paxos.PaxosAcceptor;
 import com.palantir.paxos.PaxosLearner;
+import javax.ws.rs.Path;
 
 @Path("/" + PaxosTimeLockConstants.INTERNAL_NAMESPACE
         + "/" + PaxosTimeLockConstants.LEADER_PAXOS_NAMESPACE)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnCoalescingConsumer.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnCoalescingConsumer.java
index 86e098c5e0a..aa80cd0f1eb 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnCoalescingConsumer.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnCoalescingConsumer.java
@@ -16,15 +16,14 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.autobatch.CoalescingRequestFunction;
 import com.palantir.paxos.PaxosResponse;
 import com.palantir.paxos.PaxosResponseImpl;
 import com.palantir.paxos.PaxosValue;
+import java.util.Map;
+import java.util.Set;
 
 final class LearnCoalescingConsumer implements CoalescingRequestFunction, PaxosResponse> {
     private static final PaxosResponse SUCCESSFUL_RESPONSE = new PaxosResponseImpl(true);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesCoalescingFunction.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesCoalescingFunction.java
index 86ff5796ad8..26ffef55b82 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesCoalescingFunction.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesCoalescingFunction.java
@@ -16,16 +16,15 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
 import com.google.common.collect.Maps;
 import com.google.common.collect.SetMultimap;
 import com.palantir.atlasdb.autobatch.CoalescingRequestFunction;
 import com.palantir.atlasdb.timelock.paxos.PaxosQuorumCheckingCoalescingFunction.PaxosContainer;
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.paxos.PaxosValue;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 
 final class LearnedValuesCoalescingFunction implements
         CoalescingRequestFunction, PaxosContainer>> {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesSinceCoalescingFunction.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesSinceCoalescingFunction.java
index 178121b5f5a..e18246fbd44 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesSinceCoalescingFunction.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesSinceCoalescingFunction.java
@@ -16,14 +16,8 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import static java.util.stream.Collectors.toMap;
-
 import static com.google.common.collect.ImmutableSortedMap.toImmutableSortedMap;
-
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Map;
-import java.util.Set;
+import static java.util.stream.Collectors.toMap;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSortedMap;
@@ -32,6 +26,10 @@
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.paxos.PaxosUpdate;
 import com.palantir.paxos.PaxosValue;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.Set;
 
 final class LearnedValuesSinceCoalescingFunction
         implements CoalescingRequestFunction, PaxosUpdate> {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosAcceptor.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosAcceptor.java
index 5d381ba630a..267fae53342 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosAcceptor.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosAcceptor.java
@@ -18,12 +18,6 @@
 
 import static java.util.stream.Collectors.toSet;
 
-import java.util.Optional;
-import java.util.Set;
-
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.HttpHeaders;
-
 import com.google.common.collect.SetMultimap;
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.paxos.BooleanPaxosResponse;
@@ -31,6 +25,10 @@
 import com.palantir.paxos.PaxosPromise;
 import com.palantir.paxos.PaxosProposal;
 import com.palantir.paxos.PaxosProposalId;
+import java.util.Optional;
+import java.util.Set;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.HttpHeaders;
 
 public class LocalBatchPaxosAcceptor implements BatchPaxosAcceptor {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosComponents.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosComponents.java
index cd72d0bf5c2..91444c45c84 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosComponents.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosComponents.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Map;
-
-import org.immutables.value.Value;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.util.AtlasDbMetrics;
@@ -29,6 +23,10 @@
 import com.palantir.paxos.PaxosLearner;
 import com.palantir.paxos.PaxosLearnerImpl;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Map;
+import org.immutables.value.Value;
 
 public class PaxosComponents {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosQuorumCheckingCoalescingFunction.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosQuorumCheckingCoalescingFunction.java
index a2f70f900ec..8da6995d7db 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosQuorumCheckingCoalescingFunction.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosQuorumCheckingCoalescingFunction.java
@@ -22,15 +22,6 @@
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Function;
-
-import org.immutables.value.Value;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
@@ -40,6 +31,13 @@
 import com.palantir.paxos.PaxosResponse;
 import com.palantir.paxos.PaxosResponses;
 import com.palantir.paxos.PaxosResponsesWithRemote;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Function;
+import org.immutables.value.Value;
 
 public class PaxosQuorumCheckingCoalescingFunction<
         REQ, RESP extends PaxosResponse, FUNC extends CoalescingRequestFunction> implements
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosResource.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosResource.java
index 36fc65b90ce..89f2dbab30f 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosResource.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosResource.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.timelock.paxos;
 
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-
 import com.palantir.paxos.PaxosAcceptor;
 import com.palantir.paxos.PaxosLearner;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 
 @Path("/" + PaxosTimeLockConstants.INTERNAL_NAMESPACE
         + "/" + PaxosTimeLockConstants.CLIENT_PAXOS_NAMESPACE
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStore.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStore.java
index da07e6a6cb0..ba1ba256c6a 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStore.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStore.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.List;
-import java.util.Optional;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-
-import org.immutables.value.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Ordering;
@@ -46,6 +36,13 @@
 import com.palantir.timestamp.DebugLogger;
 import com.palantir.timestamp.MultipleRunningTimestampServiceError;
 import com.palantir.timestamp.TimestampBoundStore;
+import java.util.List;
+import java.util.Optional;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.GuardedBy;
+import org.immutables.value.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PaxosTimestampBoundStore implements TimestampBoundStore {
     private static final Logger log = LoggerFactory.getLogger(PaxosTimestampBoundStore.class);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PingCoalescingFunction.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PingCoalescingFunction.java
index 090c0556caa..f62da077fbf 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PingCoalescingFunction.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PingCoalescingFunction.java
@@ -16,11 +16,10 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.autobatch.CoalescingRequestFunction;
+import java.util.Map;
+import java.util.Set;
 
 final class PingCoalescingFunction implements CoalescingRequestFunction {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PrepareCoalescingFunction.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PrepareCoalescingFunction.java
index 99250dc5716..366fe739e38 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PrepareCoalescingFunction.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PrepareCoalescingFunction.java
@@ -16,9 +16,6 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.SetMultimap;
@@ -26,6 +23,8 @@
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.paxos.PaxosPromise;
 import com.palantir.paxos.PaxosProposalId;
+import java.util.Map;
+import java.util.Set;
 
 final class PrepareCoalescingFunction implements
         CoalescingRequestFunction>, PaxosPromise> {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosAcceptorAdapter.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosAcceptorAdapter.java
index f42be974d3f..6d2a63966f8 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosAcceptorAdapter.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosAcceptorAdapter.java
@@ -18,20 +18,18 @@
 
 import static com.palantir.atlasdb.timelock.paxos.BatchPaxosAcceptorRpcClient.CACHE_KEY_NOT_FOUND;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.SetMultimap;
 import com.palantir.conjure.java.api.errors.RemoteException;
 import com.palantir.paxos.BooleanPaxosResponse;
 import com.palantir.paxos.PaxosPromise;
 import com.palantir.paxos.PaxosProposal;
 import com.palantir.paxos.PaxosProposalId;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class UseCaseAwareBatchPaxosAcceptorAdapter implements BatchPaxosAcceptor {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosLearnerAdapter.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosLearnerAdapter.java
index 72ab5c95259..c8cdd4a99f5 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosLearnerAdapter.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosLearnerAdapter.java
@@ -16,14 +16,13 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.google.common.collect.SetMultimap;
+import com.palantir.paxos.PaxosValue;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.google.common.collect.SetMultimap;
-import com.palantir.paxos.PaxosValue;
-
 public class UseCaseAwareBatchPaxosLearnerAdapter implements BatchPaxosLearner {
 
     private final PaxosUseCase useCase;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosResource.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosResource.java
index dc30615628f..475ea79407f 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosResource.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosResource.java
@@ -16,16 +16,13 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.google.common.collect.ImmutableMap;
 import java.util.EnumMap;
-
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-
 import org.immutables.value.Value;
 
-import com.google.common.collect.ImmutableMap;
-
 @Path("/" + PaxosTimeLockConstants.INTERNAL_NAMESPACE)
 public class UseCaseAwareBatchPaxosResource {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/WithSeq.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/WithSeq.java
index e838ae04f8a..b1ee36b3cb2 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/WithSeq.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/WithSeq.java
@@ -16,14 +16,12 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.util.function.BiFunction;
 import java.util.function.Function;
-
 import org.immutables.value.Value;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
 @Value.Immutable
 @JsonDeserialize(as = ImmutableWithSeq.class)
 @JsonSerialize(as = ImmutableWithSeq.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/client/CachingPartitionAllocator.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/client/CachingPartitionAllocator.java
index 70fab8065d7..5f7f7eb7da0 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/client/CachingPartitionAllocator.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/client/CachingPartitionAllocator.java
@@ -16,18 +16,17 @@
 
 package com.palantir.atlasdb.timelock.transaction.client;
 
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ForkJoinPool;
-
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.github.benmanes.caffeine.cache.RemovalCause;
 import com.github.benmanes.caffeine.cache.Ticker;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ForkJoinPool;
 
 public class CachingPartitionAllocator implements NumericPartitionAllocator {
     private final LoadingCache loadingCache;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/client/DistributingModulusGenerator.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/client/DistributingModulusGenerator.java
index 10f63d85f3e..394e6326017 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/client/DistributingModulusGenerator.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/client/DistributingModulusGenerator.java
@@ -16,18 +16,16 @@
 
 package com.palantir.atlasdb.timelock.transaction.client;
 
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Sets;
+import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import java.util.Comparator;
 import java.util.SortedSet;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.immutables.value.Value;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
-import com.palantir.logsafe.exceptions.SafeIllegalStateException;
-
 /**
  * Distributes residues of a given modulus in a balanced fashion (though we don't automatically rebalance between
  * residues).
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/timestamp/ClientAwareManagedTimestampService.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/timestamp/ClientAwareManagedTimestampService.java
index 7b9c37eba8b..b370cdda2be 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/timestamp/ClientAwareManagedTimestampService.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/timestamp/ClientAwareManagedTimestampService.java
@@ -16,10 +16,9 @@
 
 package com.palantir.atlasdb.timelock.transaction.timestamp;
 
-import java.util.UUID;
-
 import com.palantir.lock.v2.PartitionedTimestamps;
 import com.palantir.timestamp.ManagedTimestampService;
+import java.util.UUID;
 
 /**
  * Like {@link com.palantir.timestamp.TimestampService}, but may provide timestamps that are tailored to client
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/timestamp/DelegatingClientAwareManagedTimestampService.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/timestamp/DelegatingClientAwareManagedTimestampService.java
index 1ec6ef309b2..6f1f62f9b96 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/timestamp/DelegatingClientAwareManagedTimestampService.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/timestamp/DelegatingClientAwareManagedTimestampService.java
@@ -16,11 +16,6 @@
 
 package com.palantir.atlasdb.timelock.transaction.timestamp;
 
-import java.util.UUID;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.atlasdb.timelock.transaction.client.CachingPartitionAllocator;
 import com.palantir.atlasdb.timelock.transaction.client.NumericPartitionAllocator;
@@ -31,6 +26,9 @@
 import com.palantir.timestamp.ManagedTimestampService;
 import com.palantir.timestamp.TimestampRange;
 import com.palantir.timestamp.TimestampRanges;
+import java.util.UUID;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DelegatingClientAwareManagedTimestampService
         implements AutoDelegate_ManagedTimestampService, ClientAwareManagedTimestampService {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/util/LoggableIllegalStateException.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/util/LoggableIllegalStateException.java
index 79282138f5c..fdc12c3d92c 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/util/LoggableIllegalStateException.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/util/LoggableIllegalStateException.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.timelock.util;
 
-import java.util.List;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.logsafe.Arg;
 import com.palantir.logsafe.SafeLoggable;
+import java.util.List;
 
 // TODO(nziebart): replace this when http-remoting provides a similar class
 public class LoggableIllegalStateException extends IllegalStateException implements SafeLoggable {
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceImplTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceImplTest.java
index 26949775cfd..a881168c59b 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceImplTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceImplTest.java
@@ -20,10 +20,9 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.timelock.lock.AsyncLockService;
 import com.palantir.timestamp.ManagedTimestampService;
+import org.junit.Test;
 
 public class AsyncTimelockServiceImplTest {
     @Test
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/TimeLockResourceTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/TimeLockResourceTest.java
index 785839370e7..e2cbd7778cd 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/TimeLockResourceTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/TimeLockResourceTest.java
@@ -24,18 +24,16 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import com.codahale.metrics.MetricRegistry;
+import com.palantir.atlasdb.util.MetricsManager;
+import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Function;
 import java.util.function.Supplier;
-
 import org.junit.Before;
 import org.junit.Test;
 
-import com.codahale.metrics.MetricRegistry;
-import com.palantir.atlasdb.util.MetricsManager;
-import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
-
 public class TimeLockResourceTest {
     private static final String CLIENT_A = "a-client";
     private static final String CLIENT_B = "b-client";
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/config/PrivilegesConfigurationTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/config/PrivilegesConfigurationTest.java
index 2743903cff7..0233e944909 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/config/PrivilegesConfigurationTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/config/PrivilegesConfigurationTest.java
@@ -18,17 +18,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.io.File;
-import java.io.IOException;
-
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.datatype.guava.GuavaModule;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.palantir.atlasdb.timelock.auth.api.ClientId;
 import com.palantir.lock.TimelockNamespace;
+import java.io.File;
+import java.io.IOException;
+import org.junit.Test;
 
 public class PrivilegesConfigurationTest {
     private static final String ADMIN_PRIVILEGES_CONFIG = "admin-privileges-config";
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/config/TimelockAuthConfigurationTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/config/TimelockAuthConfigurationTest.java
index 18278e9dd73..5f896e5aecd 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/config/TimelockAuthConfigurationTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/config/TimelockAuthConfigurationTest.java
@@ -19,11 +19,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.io.File;
-import java.io.IOException;
-
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.datatype.guava.GuavaModule;
@@ -33,6 +28,9 @@
 import com.palantir.atlasdb.timelock.auth.api.Credentials;
 import com.palantir.atlasdb.timelock.auth.api.ImmutableCredentials;
 import com.palantir.lock.TimelockNamespace;
+import java.io.File;
+import java.io.IOException;
+import org.junit.Test;
 
 public class TimelockAuthConfigurationTest {
     private static final String TIMELOCK_AUTH_CONFIG = "timelock-auth-config";
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/CachingAuthenticatorTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/CachingAuthenticatorTest.java
index e94f4551a5e..abdd96a0824 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/CachingAuthenticatorTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/CachingAuthenticatorTest.java
@@ -18,17 +18,16 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mindrot.jbcrypt.BCrypt;
-import org.mockito.junit.MockitoJUnitRunner;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.timelock.auth.api.AuthenticatedClient;
 import com.palantir.atlasdb.timelock.auth.api.Authenticator;
 import com.palantir.atlasdb.timelock.auth.api.BCryptedSecret;
 import com.palantir.atlasdb.timelock.auth.api.ClientId;
 import com.palantir.atlasdb.timelock.auth.api.Password;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mindrot.jbcrypt.BCrypt;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class CachingAuthenticatorTest {
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/PrivilegeBasedNamespaceLockerTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/PrivilegeBasedNamespaceLockerTest.java
index e0cd4cac68e..32d6ba1e21e 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/PrivilegeBasedNamespaceLockerTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/PrivilegeBasedNamespaceLockerTest.java
@@ -18,14 +18,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.Map;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.timelock.auth.api.ClientId;
 import com.palantir.atlasdb.timelock.auth.api.Privileges;
 import com.palantir.lock.TimelockNamespace;
+import java.util.Map;
+import org.junit.Test;
 
 public class PrivilegeBasedNamespaceLockerTest {
     private static final ClientId AUTHENTICATED_CLIENT = ClientId.of("user");
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/SimpleAuthorizerTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/SimpleAuthorizerTest.java
index 312a1ccf740..fbf6db36e4b 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/SimpleAuthorizerTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/SimpleAuthorizerTest.java
@@ -19,19 +19,17 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
+import com.palantir.atlasdb.timelock.auth.api.AuthenticatedClient;
+import com.palantir.atlasdb.timelock.auth.api.ClientId;
+import com.palantir.atlasdb.timelock.auth.api.Privileges;
+import com.palantir.lock.TimelockNamespace;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.palantir.atlasdb.timelock.auth.api.AuthenticatedClient;
-import com.palantir.atlasdb.timelock.auth.api.ClientId;
-import com.palantir.atlasdb.timelock.auth.api.Privileges;
-import com.palantir.lock.TimelockNamespace;
-
 @RunWith(MockitoJUnitRunner.class)
 public class SimpleAuthorizerTest {
     private static final TimelockNamespace NAMESPACE_1 = TimelockNamespace.of("namespace_1");
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/config/ClusterConfigurationTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/config/ClusterConfigurationTest.java
index 056546c2561..bdeb698bb16 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/config/ClusterConfigurationTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/config/ClusterConfigurationTest.java
@@ -21,7 +21,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.junit.Test;
 
 public class ClusterConfigurationTest {
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/config/TargetedSweepLockControlConfigTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/config/TargetedSweepLockControlConfigTests.java
index 88320de3d1b..d47046dc7b6 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/config/TargetedSweepLockControlConfigTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/config/TargetedSweepLockControlConfigTests.java
@@ -18,9 +18,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.timelock.config.TargetedSweepLockControlConfig.Mode;
+import org.junit.Test;
 
 public class TargetedSweepLockControlConfigTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceTest.java
index 5d2e2d01306..4216bb3b320 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceTest.java
@@ -18,15 +18,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.function.Supplier;
-
-import org.junit.Test;
-
 import com.palantir.atlasdb.timelock.config.ImmutableRateLimitConfig;
 import com.palantir.atlasdb.timelock.config.TargetedSweepLockControlConfig;
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.common.concurrent.PTExecutors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.function.Supplier;
+import org.junit.Test;
 
 public class AsyncLockServiceTest {
     private static final Supplier RATE_LIMIT_CONFIG_SUPPLIER
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/AwaitedLocksCollectionTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/AwaitedLocksCollectionTest.java
index cb0d281292f..1b0683d1934 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/AwaitedLocksCollectionTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/AwaitedLocksCollectionTest.java
@@ -27,7 +27,6 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
-
 import org.awaitility.Awaitility;
 import org.awaitility.Duration;
 import org.junit.Test;
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/BlockingTimeLimitedLockServiceTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/BlockingTimeLimitedLockServiceTest.java
index 61267c63755..40f1f767ff0 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/BlockingTimeLimitedLockServiceTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/BlockingTimeLimitedLockServiceTest.java
@@ -24,12 +24,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.io.IOException;
-import java.util.concurrent.TimeoutException;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.util.concurrent.FakeTimeLimiter;
 import com.google.common.util.concurrent.TimeLimiter;
@@ -39,6 +33,10 @@
 import com.palantir.lock.LockRequest;
 import com.palantir.lock.StringLockDescriptor;
 import com.palantir.lock.remoting.BlockingTimeoutException;
+import java.io.IOException;
+import java.util.concurrent.TimeoutException;
+import org.junit.Before;
+import org.junit.Test;
 
 public class BlockingTimeLimitedLockServiceTest {
     private static final long BLOCKING_TIME_LIMIT_MILLIS = 10L;
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/TargetedSweepAsyncLockTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/TargetedSweepAsyncLockTests.java
index 7d037899dc5..38ece349cca 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/TargetedSweepAsyncLockTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/TargetedSweepAsyncLockTests.java
@@ -19,16 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.assertj.core.data.Offset;
-import org.junit.After;
-import org.junit.Test;
-
 import com.codahale.metrics.Meter;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -37,6 +27,14 @@
 import com.google.common.util.concurrent.RateLimiter;
 import com.palantir.lock.StringLockDescriptor;
 import com.palantir.util.Pair;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import org.assertj.core.data.Offset;
+import org.junit.After;
+import org.junit.Test;
 
 public class TargetedSweepAsyncLockTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/TargetedSweepLockDecoratorTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/TargetedSweepLockDecoratorTests.java
index 0f7ee9e82e0..8eaf729e466 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/TargetedSweepLockDecoratorTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/TargetedSweepLockDecoratorTests.java
@@ -19,15 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.stream.Collectors;
-
-import org.junit.After;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.sweep.queue.ShardAndStrategy;
@@ -35,6 +26,13 @@
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.StringLockDescriptor;
 import com.palantir.util.Pair;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.stream.Collectors;
+import org.junit.After;
+import org.junit.Test;
 
 public class TargetedSweepLockDecoratorTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/ThreadPooledLockServiceTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/ThreadPooledLockServiceTest.java
index 16353e8e23c..3cd1cb5ad83 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/ThreadPooledLockServiceTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/ThreadPooledLockServiceTest.java
@@ -18,14 +18,12 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
+import com.palantir.lock.CloseableLockService;
+import com.palantir.lock.impl.ThreadPooledLockService;
 import java.io.IOException;
 import java.util.concurrent.Semaphore;
-
 import org.junit.Test;
 
-import com.palantir.lock.CloseableLockService;
-import com.palantir.lock.impl.ThreadPooledLockService;
-
 public class ThreadPooledLockServiceTest {
 
     @Test
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AcceptCoalescingFunctionTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AcceptCoalescingFunctionTests.java
index 5fb235f9c99..97d1a47c6f6 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AcceptCoalescingFunctionTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AcceptCoalescingFunctionTests.java
@@ -20,22 +20,20 @@
 import static org.assertj.core.api.Assertions.entry;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.SetMultimap;
+import com.palantir.paxos.BooleanPaxosResponse;
+import com.palantir.paxos.PaxosProposal;
+import com.palantir.paxos.PaxosProposalId;
+import com.palantir.paxos.PaxosValue;
 import java.util.Map;
 import java.util.Random;
 import java.util.UUID;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableSetMultimap;
-import com.google.common.collect.SetMultimap;
-import com.palantir.paxos.BooleanPaxosResponse;
-import com.palantir.paxos.PaxosProposal;
-import com.palantir.paxos.PaxosProposalId;
-import com.palantir.paxos.PaxosValue;
-
 @RunWith(MockitoJUnitRunner.class)
 public class AcceptCoalescingFunctionTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheImplTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheImplTests.java
index 14688e57a6e..60cb45147b3 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheImplTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheImplTests.java
@@ -20,16 +20,14 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.entry;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.palantir.common.streams.KeyedStream;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.palantir.common.streams.KeyedStream;
-
 public class AcceptorCacheImplTests {
 
     @Test
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorResourceTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorResourceTests.java
index f7aa08dfd1f..427c5b73672 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorResourceTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorResourceTests.java
@@ -16,20 +16,17 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import static org.mockito.Mockito.when;
-
 import static com.palantir.conjure.java.api.testing.Assertions.assertThatServiceExceptionThrownBy;
+import static org.mockito.Mockito.when;
 
+import com.palantir.logsafe.SafeArg;
 import java.util.Optional;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.palantir.logsafe.SafeArg;
-
 @RunWith(MockitoJUnitRunner.class)
 public class BatchPaxosAcceptorResourceTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerResourceTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerResourceTests.java
index 8137304a9b7..850ab87cb64 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerResourceTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerResourceTests.java
@@ -21,10 +21,14 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.SetMultimap;
+import com.palantir.paxos.PaxosValue;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -32,12 +36,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSetMultimap;
-import com.google.common.collect.SetMultimap;
-import com.palantir.paxos.PaxosValue;
-
 @RunWith(MockitoJUnitRunner.class)
 public class BatchPaxosLearnerResourceTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeaderResourceTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeaderResourceTests.java
index 9cbf5216bef..9d45c2216e7 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeaderResourceTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeaderResourceTests.java
@@ -19,9 +19,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableSet;
+import com.palantir.paxos.PaxosValue;
 import java.util.Random;
 import java.util.UUID;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -29,9 +30,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableSet;
-import com.palantir.paxos.PaxosValue;
-
 @RunWith(MockitoJUnitRunner.class)
 public class BatchPingableLeaderResourceTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchingPaxosLatestSequenceCacheTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchingPaxosLatestSequenceCacheTests.java
index 84cc1de39a2..918a95dec1b 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchingPaxosLatestSequenceCacheTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchingPaxosLatestSequenceCacheTests.java
@@ -23,20 +23,18 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.palantir.common.streams.KeyedStream;
+import com.palantir.paxos.ImmutablePaxosLong;
+import com.palantir.paxos.PaxosLong;
 import java.util.Map;
 import java.util.Optional;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.palantir.common.streams.KeyedStream;
-import com.palantir.paxos.ImmutablePaxosLong;
-import com.palantir.paxos.PaxosLong;
-
 @RunWith(MockitoJUnitRunner.class)
 public class BatchingPaxosLatestSequenceCacheTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/DelegatingManagedTimestampServiceTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/DelegatingManagedTimestampServiceTest.java
index 124f93f480a..8b94c7e08dd 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/DelegatingManagedTimestampServiceTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/DelegatingManagedTimestampServiceTest.java
@@ -23,11 +23,10 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.junit.Test;
-
 import com.palantir.timestamp.ManagedTimestampService;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
+import org.junit.Test;
 
 public class DelegatingManagedTimestampServiceTest {
     private static final int FORTY_TWO = 42;
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnCoalescingConsumerTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnCoalescingConsumerTests.java
index 2f2db335174..bf8d2f10a35 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnCoalescingConsumerTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnCoalescingConsumerTests.java
@@ -19,18 +19,16 @@
 import static org.assertj.core.api.Assertions.entry;
 import static org.mockito.Mockito.verify;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.SetMultimap;
+import com.palantir.paxos.PaxosValue;
 import java.util.UUID;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSetMultimap;
-import com.google.common.collect.SetMultimap;
-import com.palantir.paxos.PaxosValue;
-
 @RunWith(MockitoJUnitRunner.class)
 public class LearnCoalescingConsumerTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesCoalescingFunctionTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesCoalescingFunctionTests.java
index 1d1465d7297..f2ad1bdf0da 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesCoalescingFunctionTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesCoalescingFunctionTests.java
@@ -20,22 +20,20 @@
 import static org.assertj.core.api.Assertions.entry;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.SetMultimap;
+import com.palantir.atlasdb.timelock.paxos.PaxosQuorumCheckingCoalescingFunction.PaxosContainer;
+import com.palantir.paxos.PaxosValue;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSetMultimap;
-import com.google.common.collect.SetMultimap;
-import com.palantir.atlasdb.timelock.paxos.PaxosQuorumCheckingCoalescingFunction.PaxosContainer;
-import com.palantir.paxos.PaxosValue;
-
 @RunWith(MockitoJUnitRunner.class)
 public class LearnedValuesCoalescingFunctionTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesSinceCoalescingFunctionTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesSinceCoalescingFunctionTests.java
index 92567985f12..793c8f5224f 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesSinceCoalescingFunctionTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesSinceCoalescingFunctionTests.java
@@ -19,25 +19,23 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.SetMultimap;
+import com.palantir.common.streams.KeyedStream;
+import com.palantir.paxos.PaxosUpdate;
+import com.palantir.paxos.PaxosValue;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSetMultimap;
-import com.google.common.collect.SetMultimap;
-import com.palantir.common.streams.KeyedStream;
-import com.palantir.paxos.PaxosUpdate;
-import com.palantir.paxos.PaxosValue;
-
 @RunWith(MockitoJUnitRunner.class)
 public class LearnedValuesSinceCoalescingFunctionTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosAcceptorTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosAcceptorTests.java
index cdda4a9cddc..acbdf48b55f 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosAcceptorTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosAcceptorTests.java
@@ -20,10 +20,17 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.SetMultimap;
+import com.palantir.paxos.BooleanPaxosResponse;
+import com.palantir.paxos.PaxosPromise;
+import com.palantir.paxos.PaxosProposal;
+import com.palantir.paxos.PaxosProposalId;
+import com.palantir.paxos.PaxosValue;
 import java.util.Optional;
 import java.util.Random;
 import java.util.UUID;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,15 +38,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSetMultimap;
-import com.google.common.collect.SetMultimap;
-import com.palantir.paxos.BooleanPaxosResponse;
-import com.palantir.paxos.PaxosPromise;
-import com.palantir.paxos.PaxosProposal;
-import com.palantir.paxos.PaxosProposalId;
-import com.palantir.paxos.PaxosValue;
-
 @SuppressWarnings("unchecked")
 @RunWith(MockitoJUnitRunner.class)
 public class LocalBatchPaxosAcceptorTests {
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosComponentsTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosComponentsTest.java
index d982b5405e5..9be20ba9c00 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosComponentsTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosComponentsTest.java
@@ -17,23 +17,21 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.palantir.paxos.PaxosAcceptor;
+import com.palantir.paxos.PaxosLearner;
+import com.palantir.paxos.PaxosProposal;
+import com.palantir.paxos.PaxosProposalId;
+import com.palantir.paxos.PaxosValue;
+import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import com.palantir.paxos.PaxosAcceptor;
-import com.palantir.paxos.PaxosLearner;
-import com.palantir.paxos.PaxosProposal;
-import com.palantir.paxos.PaxosProposalId;
-import com.palantir.paxos.PaxosValue;
-import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
-
 public class PaxosComponentsTest {
     private static final Client CLIENT = Client.of("alice");
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosQuorumCheckingCoalescingFunctionTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosQuorumCheckingCoalescingFunctionTests.java
index 0a8a82a8101..64cd2ad0eb5 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosQuorumCheckingCoalescingFunctionTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosQuorumCheckingCoalescingFunctionTests.java
@@ -19,16 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 
-import java.util.Arrays;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -38,6 +28,14 @@
 import com.palantir.paxos.ImmutablePaxosLong;
 import com.palantir.paxos.PaxosLong;
 import com.palantir.paxos.PaxosResponsesWithRemote;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class PaxosQuorumCheckingCoalescingFunctionTests {
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimeLockUriUtilsTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimeLockUriUtilsTest.java
index 32f067c24ba..a75d07a7deb 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimeLockUriUtilsTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimeLockUriUtilsTest.java
@@ -17,12 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.ImmutableSet;
 import java.util.Set;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableSet;
-
 public class PaxosTimeLockUriUtilsTest {
     private static final String ADDRESS_1 = "foo:1234";
     private static final String ADDRESS_2 = "bar:5678";
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStoreTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStoreTest.java
index a22072928ce..ad1db6a44ae 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStoreTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStoreTest.java
@@ -16,7 +16,6 @@
 package com.palantir.atlasdb.timelock.paxos;
 
 import static java.util.stream.Collectors.toList;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
@@ -26,24 +25,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Stream;
-
-import javax.annotation.Nullable;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -61,6 +42,21 @@
 import com.palantir.paxos.SingleLeaderAcceptorNetworkClient;
 import com.palantir.paxos.SingleLeaderLearnerNetworkClient;
 import com.palantir.tritium.metrics.registry.SharedTaggedMetricRegistries;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Stream;
+import javax.annotation.Nullable;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 @RunWith(Parameterized.class)
 public class PaxosTimestampBoundStoreTest {
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PingCoalescingFunctionTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PingCoalescingFunctionTests.java
index 451c3a045d6..b8bc524a247 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PingCoalescingFunctionTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PingCoalescingFunctionTests.java
@@ -19,15 +19,13 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableSet;
 import java.util.Set;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableSet;
-
 @RunWith(MockitoJUnitRunner.class)
 public class PingCoalescingFunctionTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PrepareCoalescingFunctionTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PrepareCoalescingFunctionTests.java
index 1641ab1e8c8..1aa17d63021 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PrepareCoalescingFunctionTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PrepareCoalescingFunctionTests.java
@@ -20,20 +20,18 @@
 import static org.assertj.core.api.Assertions.entry;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.SetMultimap;
+import com.palantir.paxos.PaxosPromise;
+import com.palantir.paxos.PaxosProposalId;
 import java.util.Map;
 import java.util.Random;
 import java.util.UUID;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableSetMultimap;
-import com.google.common.collect.SetMultimap;
-import com.palantir.paxos.PaxosPromise;
-import com.palantir.paxos.PaxosProposalId;
-
 @RunWith(MockitoJUnitRunner.class)
 public class PrepareCoalescingFunctionTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/client/CachingPartitionAllocatorTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/client/CachingPartitionAllocatorTest.java
index 8719c237be8..33e9f0b782d 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/client/CachingPartitionAllocatorTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/client/CachingPartitionAllocatorTest.java
@@ -23,18 +23,16 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import com.github.benmanes.caffeine.cache.Ticker;
+import com.google.common.collect.Iterables;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.jmock.lib.concurrent.DeterministicScheduler;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.github.benmanes.caffeine.cache.Ticker;
-import com.google.common.collect.Iterables;
-
 public class CachingPartitionAllocatorTest {
     private static final String KEY = "foo";
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/client/DistributingModulusGeneratorTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/client/DistributingModulusGeneratorTest.java
index 96702a69794..a414649737a 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/client/DistributingModulusGeneratorTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/client/DistributingModulusGeneratorTest.java
@@ -20,16 +20,14 @@
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.junit.Test;
 
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
-
 public class DistributingModulusGeneratorTest {
     private DistributingModulusGenerator generator;
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/timestamp/DelegatingClientAwareManagedTimestampServiceTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/timestamp/DelegatingClientAwareManagedTimestampServiceTest.java
index 9b0ccfc32d9..3e95523eca6 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/timestamp/DelegatingClientAwareManagedTimestampServiceTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/timestamp/DelegatingClientAwareManagedTimestampServiceTest.java
@@ -25,17 +25,15 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.util.List;
-import java.util.UUID;
-
-import org.junit.After;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.timelock.transaction.client.NumericPartitionAllocator;
 import com.palantir.lock.v2.TimestampAndPartition;
 import com.palantir.timestamp.ManagedTimestampService;
 import com.palantir.timestamp.TimestampRange;
+import java.util.List;
+import java.util.UUID;
+import org.junit.After;
+import org.junit.Test;
 
 @SuppressWarnings("unchecked") // Mocks of parameterised types
 public class DelegatingClientAwareManagedTimestampServiceTest {
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/BenchmarksResource.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/BenchmarksResource.java
index e7af1b0e520..4143898fd99 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/BenchmarksResource.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/BenchmarksResource.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks;
 
-import java.util.Map;
-import java.util.Optional;
-
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.atlasdb.config.AtlasDbConfig;
 import com.palantir.atlasdb.factory.TransactionManagers;
@@ -37,6 +34,8 @@
 import com.palantir.atlasdb.timelock.benchmarks.schema.BenchmarksSchema;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.tritium.metrics.registry.SharedTaggedMetricRegistries;
+import java.util.Map;
+import java.util.Optional;
 
 public class BenchmarksResource implements BenchmarksService {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/BenchmarksService.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/BenchmarksService.java
index c67fb3dc0db..435425f5ae6 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/BenchmarksService.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/BenchmarksService.java
@@ -16,7 +16,6 @@
 package com.palantir.atlasdb.timelock.benchmarks;
 
 import java.util.Map;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/TimelockBenchmarkClientLauncher.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/TimelockBenchmarkClientLauncher.java
index 2c02d84b6de..8b68a097247 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/TimelockBenchmarkClientLauncher.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/TimelockBenchmarkClientLauncher.java
@@ -22,7 +22,6 @@
 import com.palantir.atlasdb.timelock.logging.NonBlockingFileAppenderFactory;
 import com.palantir.conjure.java.server.jersey.ConjureJerseyFeature;
 import com.palantir.tritium.metrics.MetricRegistries;
-
 import io.dropwizard.Application;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractBenchmark.java
index 55fb5408b8d..8372b61af64 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractBenchmark.java
@@ -15,6 +15,9 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
@@ -23,14 +26,9 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLongArray;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
-
 public abstract class AbstractBenchmark {
 
     private static final Logger log = LoggerFactory.getLogger(AbstractBenchmark.class);
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractRangeScanBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractRangeScanBenchmark.java
index c59adae00a8..fb8d598e5f1 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractRangeScanBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractRangeScanBenchmark.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
@@ -35,6 +25,14 @@
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.random.RandomBytes;
 import com.palantir.logsafe.Preconditions;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A base class for implementing range scan benchmarks. A primary function of this class is to store metadata
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractWriteTransactionBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractWriteTransactionBenchmark.java
index 206ad7ed40c..77c166e8623 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractWriteTransactionBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractWriteTransactionBenchmark.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BenchmarksTableFactory;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.random.RandomBytes;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 public abstract class AbstractWriteTransactionBenchmark extends AbstractBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsPutUnlessExistsBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsPutUnlessExistsBenchmark.java
index 6ebf58fe777..65b46923198 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsPutUnlessExistsBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsPutUnlessExistsBenchmark.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.Map;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.timelock.benchmarks.schema.BenchmarksSchema;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.random.RandomBytes;
+import java.util.Map;
 
 public final class KvsPutUnlessExistsBenchmark extends AbstractBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsReadBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsReadBenchmark.java
index 8e52d2ea710..76e644ef505 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsReadBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsReadBenchmark.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.Map;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -25,6 +23,7 @@
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.random.RandomBytes;
 import com.palantir.logsafe.Preconditions;
+import java.util.Map;
 
 public final class KvsReadBenchmark extends AbstractBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsWriteBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsWriteBenchmark.java
index 2ce3d341499..65cb725f2b1 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsWriteBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsWriteBenchmark.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.Map;
-import java.util.UUID;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -25,6 +22,8 @@
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.Map;
+import java.util.UUID;
 
 public final class KvsWriteBenchmark extends AbstractBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/LockAndUnlockContendedBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/LockAndUnlockContendedBenchmark.java
index b8105083c65..4358e99c6d9 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/LockAndUnlockContendedBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/LockAndUnlockContendedBenchmark.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicLong;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -31,6 +26,10 @@
 import com.palantir.lock.v2.LockToken;
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.logsafe.Preconditions;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
 
 public class LockAndUnlockContendedBenchmark extends AbstractBenchmark {
     private static final int ACQUIRE_TIMEOUT_MS = 50_000;
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/LockAndUnlockUncontendedBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/LockAndUnlockUncontendedBenchmark.java
index 32f3f9ee71b..4ac993ea090 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/LockAndUnlockUncontendedBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/LockAndUnlockUncontendedBenchmark.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.Map;
-
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.lock.v2.TimelockService;
+import java.util.Map;
 
 public final class LockAndUnlockUncontendedBenchmark extends LockAndUnlockContendedBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/RangeScanDynamicColumnsBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/RangeScanDynamicColumnsBenchmark.java
index deec274c9cd..cfbe96c6119 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/RangeScanDynamicColumnsBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/RangeScanDynamicColumnsBenchmark.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
@@ -28,6 +25,8 @@
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.KvDynamicColumnsTable.KvDynamicColumnsRow;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.List;
+import java.util.Map;
 
 public final class RangeScanDynamicColumnsBenchmark extends AbstractRangeScanBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/RangeScanRowsBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/RangeScanRowsBenchmark.java
index 7ef94485d5f..d7fe7697d73 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/RangeScanRowsBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/RangeScanRowsBenchmark.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.List;
-import java.util.Map;
-
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BenchmarksTableFactory;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.KvRowsTable;
@@ -25,6 +22,8 @@
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.KvRowsTable.KvRowsRowResult;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.List;
+import java.util.Map;
 
 public final class RangeScanRowsBenchmark extends AbstractRangeScanBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TimestampBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TimestampBenchmark.java
index 54878acedbd..43e43d42fe2 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TimestampBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TimestampBenchmark.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.Map;
-
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.timestamp.TimestampService;
+import java.util.Map;
 
 public final class TimestampBenchmark extends AbstractBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionReadRowsBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionReadRowsBenchmark.java
index d7553a6ce02..f99764fc4ca 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionReadRowsBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionReadRowsBenchmark.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BenchmarksTableFactory;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BlobsTable;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BlobsTable.BlobsRow;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.random.RandomBytes;
 import com.palantir.logsafe.Preconditions;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class TransactionReadRowsBenchmark extends AbstractBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteBenchmarkContended.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteBenchmarkContended.java
index 2c12859b307..9f86ef24e14 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteBenchmarkContended.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteBenchmarkContended.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.Arrays;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.LongStream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BenchmarksTableFactory;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BlobsSerializableTable;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BlobsSerializableTable.BlobsSerializableRow;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.random.RandomBytes;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.LongStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class TransactionWriteBenchmarkContended extends AbstractBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteDynamicColumnsBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteDynamicColumnsBenchmark.java
index c6a0d69b639..399eeca835b 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteDynamicColumnsBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteDynamicColumnsBenchmark.java
@@ -15,16 +15,15 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.KvDynamicColumnsTable;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.KvDynamicColumnsTable.KvDynamicColumnsColumn;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.KvDynamicColumnsTable.KvDynamicColumnsColumnValue;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.KvDynamicColumnsTable.KvDynamicColumnsRow;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 public final class TransactionWriteDynamicColumnsBenchmark extends AbstractWriteTransactionBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteRowsBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteRowsBenchmark.java
index 2525782f443..679779c69f9 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteRowsBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteRowsBenchmark.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.List;
-import java.util.Map;
-
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BlobsTable;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BlobsTable.BlobsRow;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.random.RandomBytes;
+import java.util.List;
+import java.util.Map;
 
 public final class TransactionWriteRowsBenchmark extends AbstractWriteTransactionBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/config/TimelockBenchmarkClientConfig.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/config/TimelockBenchmarkClientConfig.java
index 9290ce954d3..856dd382f7b 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/config/TimelockBenchmarkClientConfig.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/config/TimelockBenchmarkClientConfig.java
@@ -17,7 +17,6 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.palantir.atlasdb.config.AtlasDbConfig;
-
 import io.dropwizard.Configuration;
 
 public class TimelockBenchmarkClientConfig extends Configuration {
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/BenchmarkRunnerBase.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/BenchmarkRunnerBase.java
index 36d6c4252da..e7d4fac8c95 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/BenchmarkRunnerBase.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/BenchmarkRunnerBase.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.runner;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.BiFunction;
-import java.util.function.Supplier;
-
-import org.apache.commons.lang3.StringUtils;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -33,6 +23,14 @@
 import com.palantir.atlasdb.http.AtlasDbFeignTargetFactory;
 import com.palantir.atlasdb.timelock.benchmarks.BenchmarksService;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.function.Supplier;
+import org.apache.commons.lang3.StringUtils;
 
 public class BenchmarkRunnerBase {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/BenchmarksRunner.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/BenchmarksRunner.java
index f58906b7109..29a54d012e9 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/BenchmarksRunner.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/BenchmarksRunner.java
@@ -84,4 +84,3 @@ public void dynamicColumnsRangeScan() {
     }
 
 }
-
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/SlaVerifier.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/SlaVerifier.java
index 95f468b42ef..9c1170ac218 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/SlaVerifier.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/SlaVerifier.java
@@ -25,7 +25,6 @@
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.junit.BeforeClass;
 import org.junit.Test;
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/BenchmarksSchema.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/BenchmarksSchema.java
index e8ad5bd88e1..d417505e386 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/BenchmarksSchema.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/BenchmarksSchema.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.schema;
 
-import java.io.File;
-import java.io.IOException;
-
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.schema.AtlasSchema;
@@ -26,6 +23,8 @@
 import com.palantir.atlasdb.table.description.TableDefinition;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
+import java.io.File;
+import java.io.IOException;
 
 public final class BenchmarksSchema implements AtlasSchema {
     public static final Namespace NAMESPACE = Namespace.create("benchmarks");
diff --git a/timelock-server-benchmark-cluster/src/main/java/com/palantir/atlasdb/timelock/benchmarks/server/TimelockBenchmarkServerLauncher.java b/timelock-server-benchmark-cluster/src/main/java/com/palantir/atlasdb/timelock/benchmarks/server/TimelockBenchmarkServerLauncher.java
index b36591d3292..7b4c400bbf7 100644
--- a/timelock-server-benchmark-cluster/src/main/java/com/palantir/atlasdb/timelock/benchmarks/server/TimelockBenchmarkServerLauncher.java
+++ b/timelock-server-benchmark-cluster/src/main/java/com/palantir/atlasdb/timelock/benchmarks/server/TimelockBenchmarkServerLauncher.java
@@ -22,7 +22,6 @@
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.timelock.paxos.TimeLockAgent;
 import com.palantir.tritium.metrics.registry.SharedTaggedMetricRegistries;
-
 import io.dropwizard.Application;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
diff --git a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceIntegrationTest.java b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceIntegrationTest.java
index fc52f7753f9..f7534b06e6d 100644
--- a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceIntegrationTest.java
+++ b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceIntegrationTest.java
@@ -19,18 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertTrue;
 
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.stream.Collectors;
-
-import org.junit.After;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
@@ -55,6 +43,16 @@
 import com.palantir.lock.v2.WaitForLocksRequest;
 import com.palantir.lock.v2.WaitForLocksResponse;
 import com.palantir.timestamp.TimestampRange;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
+import org.junit.After;
+import org.junit.Test;
 
 public class AsyncTimelockServiceIntegrationTest extends AbstractAsyncTimelockServiceIntegrationTest {
 
diff --git a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceTargetedSweepRateLimitingTest.java b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceTargetedSweepRateLimitingTest.java
index 2b79be412af..ed8e46153b6 100644
--- a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceTargetedSweepRateLimitingTest.java
+++ b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceTargetedSweepRateLimitingTest.java
@@ -16,28 +16,10 @@
 
 package com.palantir.atlasdb.timelock;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import static com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy.CONSERVATIVE;
 import static com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy.THOROUGH;
 import static com.palantir.atlasdb.timelock.lock.TargetedSweepLockDecorator.LOCK_ACQUIRES_PER_SECOND;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-import java.util.UUID;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import org.assertj.core.data.Offset;
-import org.junit.After;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import com.codahale.metrics.Meter;
 import com.google.common.collect.ImmutableList;
@@ -58,6 +40,21 @@
 import com.palantir.lock.v2.LockResponse;
 import com.palantir.lock.v2.LockToken;
 import com.palantir.util.Pair;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import org.assertj.core.data.Offset;
+import org.junit.After;
+import org.junit.Test;
 
 public class AsyncTimelockServiceTargetedSweepRateLimitingTest extends AbstractAsyncTimelockServiceIntegrationTest {
 
@@ -190,7 +187,7 @@ public void circular() throws InterruptedException {
     private static Supplier lockDescriptorSupplier(
             int numShards,
             SweepStrategy sweepStrategy) {
-        AtomicInteger counter = new AtomicInteger(new Random().nextInt() % numShards);
+        AtomicInteger counter = new AtomicInteger(new Random().nextInt(numShards));
         return () -> {
             int shard = counter.getAndIncrement() % numShards;
             ShardAndStrategy shardStrategy = ShardAndStrategy.of(shard, sweepStrategy);
diff --git a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceTransactionIntegrationTest.java b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceTransactionIntegrationTest.java
index a03492cabab..8bdd774bbbd 100644
--- a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceTransactionIntegrationTest.java
+++ b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceTransactionIntegrationTest.java
@@ -19,20 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertTrue;
 
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.assertj.core.api.ThrowableAssert;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -48,6 +34,18 @@
 import com.palantir.lock.LockRefreshToken;
 import com.palantir.lock.LockRequest;
 import com.palantir.lock.StringLockDescriptor;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.assertj.core.api.ThrowableAssert;
+import org.junit.Test;
 
 public class AsyncTimelockServiceTransactionIntegrationTest extends AbstractAsyncTimelockServiceIntegrationTest {
 
diff --git a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/IsolatedPaxosTimeLockServerIntegrationTest.java b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/IsolatedPaxosTimeLockServerIntegrationTest.java
index dd86ebc2856..26e246491cd 100644
--- a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/IsolatedPaxosTimeLockServerIntegrationTest.java
+++ b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/IsolatedPaxosTimeLockServerIntegrationTest.java
@@ -17,12 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.util.Optional;
-
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.RuleChain;
-
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.atlasdb.http.AtlasDbHttpClients;
 import com.palantir.atlasdb.timelock.paxos.PaxosTimeLockConstants;
@@ -30,6 +24,10 @@
 import com.palantir.atlasdb.timelock.util.TestProxies;
 import com.palantir.paxos.PaxosAcceptor;
 import com.palantir.paxos.PaxosLearner;
+import java.util.Optional;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
 
 /**
  * This test creates a single TimeLock server that is configured in a three node configuration.
diff --git a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/PaxosTimeLockServerIntegrationTest.java b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/PaxosTimeLockServerIntegrationTest.java
index 2e3fd5159e8..fd36700f9c8 100644
--- a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/PaxosTimeLockServerIntegrationTest.java
+++ b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/PaxosTimeLockServerIntegrationTest.java
@@ -18,30 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.SortedMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.assertj.core.util.Lists;
-import org.awaitility.Awaitility;
-import org.eclipse.jetty.http.HttpStatus;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TemporaryFolder;
-
 import com.codahale.metrics.MetricRegistry;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Throwables;
@@ -67,13 +43,34 @@
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
-
 import io.dropwizard.testing.ResourceHelpers;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.SortedMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
+import org.assertj.core.util.Lists;
+import org.awaitility.Awaitility;
+import org.eclipse.jetty.http.HttpStatus;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TemporaryFolder;
 
 public class PaxosTimeLockServerIntegrationTest {
     private static final String CLIENT_1 = "test";
diff --git a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/TemporaryConfigurationHolderTest.java b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/TemporaryConfigurationHolderTest.java
index 89329857866..20095c817c5 100644
--- a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/TemporaryConfigurationHolderTest.java
+++ b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/TemporaryConfigurationHolderTest.java
@@ -20,7 +20,6 @@
 
 import java.io.File;
 import java.io.IOException;
-
 import org.apache.commons.io.FileUtils;
 import org.junit.ClassRule;
 import org.junit.Test;
diff --git a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/TimeLockServerDownIntegrationTest.java b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/TimeLockServerDownIntegrationTest.java
index fd0a3e786df..1fea51515cf 100644
--- a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/TimeLockServerDownIntegrationTest.java
+++ b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/TimeLockServerDownIntegrationTest.java
@@ -18,10 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.RuleChain;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.AtlasDbConstants;
@@ -30,6 +26,9 @@
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.exception.AtlasDbDependencyException;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
 
 public class TimeLockServerDownIntegrationTest {
     private static final TableReference TABLE = TableReference.create(Namespace.create("test"), "test");
diff --git a/timelock-server/src/main/java/com/palantir/atlasdb/timelock/TimeLockServerLauncher.java b/timelock-server/src/main/java/com/palantir/atlasdb/timelock/TimeLockServerLauncher.java
index 5a1b088b2ae..0ab15f8c192 100644
--- a/timelock-server/src/main/java/com/palantir/atlasdb/timelock/TimeLockServerLauncher.java
+++ b/timelock-server/src/main/java/com/palantir/atlasdb/timelock/TimeLockServerLauncher.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import java.util.UUID;
-import java.util.function.Consumer;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.SharedMetricRegistries;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
@@ -33,11 +26,15 @@
 import com.palantir.conjure.java.server.jersey.ConjureJerseyFeature;
 import com.palantir.timelock.paxos.TimeLockAgent;
 import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
-
 import io.dropwizard.Application;
 import io.dropwizard.jersey.optional.EmptyOptionalException;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
+import java.util.UUID;
+import java.util.function.Consumer;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
 
 /**
  * Provides a way of launching an embedded TimeLock server using Dropwizard. Should only be used in tests.
diff --git a/timelock-server/src/main/java/com/palantir/atlasdb/timelock/config/CombinedTimeLockServerConfiguration.java b/timelock-server/src/main/java/com/palantir/atlasdb/timelock/config/CombinedTimeLockServerConfiguration.java
index 496c30302ba..08361a1ec03 100644
--- a/timelock-server/src/main/java/com/palantir/atlasdb/timelock/config/CombinedTimeLockServerConfiguration.java
+++ b/timelock-server/src/main/java/com/palantir/atlasdb/timelock/config/CombinedTimeLockServerConfiguration.java
@@ -19,7 +19,6 @@
 import com.palantir.conjure.java.api.config.service.HumanReadableDuration;
 import com.palantir.timelock.config.TimeLockInstallConfiguration;
 import com.palantir.timelock.config.TimeLockRuntimeConfiguration;
-
 import io.dropwizard.Configuration;
 
 public class CombinedTimeLockServerConfiguration extends Configuration {
diff --git a/timelock-server/src/main/java/com/palantir/atlasdb/timelock/config/TimeLockServerConfiguration.java b/timelock-server/src/main/java/com/palantir/atlasdb/timelock/config/TimeLockServerConfiguration.java
index 5cedaf17c10..0e829b1c681 100644
--- a/timelock-server/src/main/java/com/palantir/atlasdb/timelock/config/TimeLockServerConfiguration.java
+++ b/timelock-server/src/main/java/com/palantir/atlasdb/timelock/config/TimeLockServerConfiguration.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.config;
 
-import java.util.Set;
-
-import org.immutables.value.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.MoreObjects;
 import com.palantir.atlasdb.timelock.paxos.PaxosTimeLockConstants;
@@ -28,10 +22,13 @@
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import com.palantir.timelock.config.ImmutablePaxosTsBoundPersisterConfiguration;
 import com.palantir.timelock.config.TsBoundPersisterConfiguration;
-
 import io.dropwizard.Configuration;
 import io.dropwizard.jetty.HttpConnectorFactory;
 import io.dropwizard.server.DefaultServerFactory;
+import java.util.Set;
+import org.immutables.value.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TimeLockServerConfiguration extends Configuration {
     private static final Logger log = LoggerFactory.getLogger(TimeLockServerConfiguration.class);
diff --git a/timelock-server/src/main/java/com/palantir/atlasdb/timelock/logging/NonBlockingFileAppenderFactory.java b/timelock-server/src/main/java/com/palantir/atlasdb/timelock/logging/NonBlockingFileAppenderFactory.java
index 38be7ba787d..388f5f26632 100644
--- a/timelock-server/src/main/java/com/palantir/atlasdb/timelock/logging/NonBlockingFileAppenderFactory.java
+++ b/timelock-server/src/main/java/com/palantir/atlasdb/timelock/logging/NonBlockingFileAppenderFactory.java
@@ -15,15 +15,12 @@
  */
 package com.palantir.atlasdb.timelock.logging;
 
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.google.common.base.Preconditions;
-
-// CHECKSTYLE:OFF
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.core.Appender;
 import ch.qos.logback.core.AsyncAppenderBase;
 import ch.qos.logback.core.spi.DeferredProcessingAware;
-// CHECKSTYLE:ON
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.google.common.base.Preconditions;
 import io.dropwizard.logging.FileAppenderFactory;
 import io.dropwizard.logging.async.AsyncAppenderFactory;
 import io.dropwizard.logging.filter.LevelFilterFactory;
diff --git a/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/MultiNodePaxosTimeLockServerIntegrationTest.java b/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/MultiNodePaxosTimeLockServerIntegrationTest.java
index 1229d2ee07f..40714b9b867 100644
--- a/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/MultiNodePaxosTimeLockServerIntegrationTest.java
+++ b/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/MultiNodePaxosTimeLockServerIntegrationTest.java
@@ -19,22 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
@@ -56,6 +40,20 @@
 import com.palantir.lock.v2.StartTransactionRequestV4;
 import com.palantir.lock.v2.StartTransactionResponseV4;
 import com.palantir.lock.v2.TimelockService;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 @RunWith(Parameterized.class)
 public class MultiNodePaxosTimeLockServerIntegrationTest {
diff --git a/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/suite/PaxosSuite.java b/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/suite/PaxosSuite.java
index ffa3376581c..1e98a5eb887 100644
--- a/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/suite/PaxosSuite.java
+++ b/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/suite/PaxosSuite.java
@@ -16,18 +16,16 @@
 
 package com.palantir.atlasdb.timelock.suite;
 
-import java.util.Collection;
-
-import org.junit.Rule;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Suite;
-
 import com.github.peterwippermann.junit4.parameterizedsuite.ParameterizedSuite;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.timelock.ImmutableClusterName;
 import com.palantir.atlasdb.timelock.MultiNodePaxosTimeLockServerIntegrationTest;
 import com.palantir.atlasdb.timelock.TestableTimelockCluster;
+import java.util.Collection;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Suite;
 
 @RunWith(ParameterizedSuite.class)
 @Suite.SuiteClasses(MultiNodePaxosTimeLockServerIntegrationTest.class)
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/config/DatabaseTsBoundPersisterConfigurationTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/config/DatabaseTsBoundPersisterConfigurationTest.java
index ecc55acb7f7..d76d092f8f8 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/config/DatabaseTsBoundPersisterConfigurationTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/config/DatabaseTsBoundPersisterConfigurationTest.java
@@ -17,11 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.memory.InMemoryAtlasDbConfig;
 import com.palantir.timelock.config.DatabaseTsBoundPersisterConfiguration;
 import com.palantir.timelock.config.ImmutableDatabaseTsBoundPersisterConfiguration;
+import org.junit.Test;
 
 public class DatabaseTsBoundPersisterConfigurationTest {
     @Test
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/config/TimeLockServerConfigurationTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/config/TimeLockServerConfigurationTest.java
index 4fd34895d15..2ebeb0ffdbc 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/config/TimeLockServerConfigurationTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/config/TimeLockServerConfigurationTest.java
@@ -18,11 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.net.InetSocketAddress;
-import java.util.Set;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.cassandra.ImmutableCassandraCredentialsConfig;
@@ -36,6 +31,9 @@
 import com.palantir.nexus.db.pool.config.ImmutablePostgresConnectionConfig;
 import com.palantir.timelock.config.ImmutableDatabaseTsBoundPersisterConfiguration;
 import com.palantir.timelock.config.ImmutablePaxosTsBoundPersisterConfiguration;
+import java.net.InetSocketAddress;
+import java.util.Set;
+import org.junit.Test;
 
 public class TimeLockServerConfigurationTest {
     private static final String ADDRESS = "localhost:8701";
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceEteTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceEteTest.java
index c586860caed..ca0eaaf800f 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceEteTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceEteTest.java
@@ -20,6 +20,15 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 
+import com.codahale.metrics.MetricRegistry;
+import com.google.common.base.Stopwatch;
+import com.google.common.util.concurrent.Uninterruptibles;
+import com.palantir.flake.FlakeRetryingRule;
+import com.palantir.flake.ShouldRetry;
+import com.palantir.leader.NotCurrentLeaderException;
+import com.palantir.lock.LockDescriptor;
+import com.palantir.lock.StringLockDescriptor;
+import com.palantir.lock.v2.LockToken;
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.Set;
@@ -28,21 +37,10 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
 
-import com.codahale.metrics.MetricRegistry;
-import com.google.common.base.Stopwatch;
-import com.google.common.util.concurrent.Uninterruptibles;
-import com.palantir.flake.FlakeRetryingRule;
-import com.palantir.flake.ShouldRetry;
-import com.palantir.leader.NotCurrentLeaderException;
-import com.palantir.lock.LockDescriptor;
-import com.palantir.lock.StringLockDescriptor;
-import com.palantir.lock.v2.LockToken;
-
 public class AsyncLockServiceEteTest {
 
     private static final UUID REQUEST_1 = UUID.randomUUID();
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceTest.java
index dafc0da36b3..e913537e395 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceTest.java
@@ -26,21 +26,19 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.lock.LockDescriptor;
+import com.palantir.lock.StringLockDescriptor;
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
 import org.jmock.lib.concurrent.DeterministicScheduler;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.lock.LockDescriptor;
-import com.palantir.lock.StringLockDescriptor;
-
 public class AsyncLockServiceTest {
 
     private static final UUID REQUEST_ID = UUID.randomUUID();
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/ExclusiveLockTests.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/ExclusiveLockTests.java
index fa6bbe0d7c0..a623f04587f 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/ExclusiveLockTests.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/ExclusiveLockTests.java
@@ -19,12 +19,10 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertTrue;
 
-import java.util.UUID;
-
-import org.junit.Test;
-
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.StringLockDescriptor;
+import java.util.UUID;
+import org.junit.Test;
 
 public class ExclusiveLockTests {
 
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/HeldLocksCollectionTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/HeldLocksCollectionTest.java
index 91fb02e75e3..5f1daefe294 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/HeldLocksCollectionTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/HeldLocksCollectionTest.java
@@ -21,15 +21,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.time.Duration;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-import org.junit.Test;
-
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableSet;
@@ -38,6 +29,13 @@
 import com.palantir.lock.v2.LeadershipId;
 import com.palantir.lock.v2.Lease;
 import com.palantir.lock.v2.LockToken;
+import java.time.Duration;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import org.junit.Test;
 
 public class HeldLocksCollectionTest {
 
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/HeldLocksTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/HeldLocksTest.java
index e459e390641..7b5b9063fd6 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/HeldLocksTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/HeldLocksTest.java
@@ -22,15 +22,13 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.UUID;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableList;
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.StringLockDescriptor;
+import java.util.UUID;
+import org.junit.Before;
+import org.junit.Test;
 
 public class HeldLocksTest {
 
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampTrackerTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampTrackerTest.java
index 0d5c1ffd25b..130f6d9f44a 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampTrackerTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampTrackerTest.java
@@ -20,7 +20,6 @@
 
 import java.util.Optional;
 import java.util.UUID;
-
 import org.junit.Test;
 
 public class ImmutableTimestampTrackerTest {
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LeaseExpirationTimerTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LeaseExpirationTimerTest.java
index 481b4bb385d..4e3492fb56e 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LeaseExpirationTimerTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LeaseExpirationTimerTest.java
@@ -17,14 +17,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.palantir.common.time.NanoTime;
 import java.time.Duration;
 import java.util.function.Supplier;
-
 import org.junit.Before;
 import org.junit.Test;
 
-import com.palantir.common.time.NanoTime;
-
 public class LeaseExpirationTimerTest {
 
     private static final long START_TIME_NANOS = 123L;
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LockAcquirerTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LockAcquirerTest.java
index ceac7e3f065..41623a32513 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LockAcquirerTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LockAcquirerTest.java
@@ -26,21 +26,19 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
+import com.codahale.metrics.MetricRegistry;
+import com.google.common.collect.ImmutableList;
+import com.palantir.lock.LockDescriptor;
+import com.palantir.lock.StringLockDescriptor;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.jmock.lib.concurrent.DeterministicScheduler;
 import org.junit.Test;
 import org.mockito.InOrder;
 
-import com.codahale.metrics.MetricRegistry;
-import com.google.common.collect.ImmutableList;
-import com.palantir.lock.LockDescriptor;
-import com.palantir.lock.StringLockDescriptor;
-
 public class LockAcquirerTest {
 
     private static final UUID REQUEST_ID = UUID.randomUUID();
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LockCollectionTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LockCollectionTest.java
index a8dfd080a29..124793a3cf7 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LockCollectionTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LockCollectionTest.java
@@ -17,19 +17,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.ImmutableSet;
+import com.palantir.lock.LockDescriptor;
+import com.palantir.lock.StringLockDescriptor;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableSet;
-import com.palantir.lock.LockDescriptor;
-import com.palantir.lock.StringLockDescriptor;
-
 public class LockCollectionTest {
 
     private final LockCollection lockCollection = new LockCollection(OrderedLocksDecorator.DO_NOTHING);
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimeLockConstantsTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimeLockConstantsTest.java
index 44f77f760fa..63d17c358e4 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimeLockConstantsTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimeLockConstantsTest.java
@@ -17,9 +17,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.timelock.config.TimeLockServerConfiguration;
+import org.junit.Test;
 
 public class PaxosTimeLockConstantsTest {
     @Test
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/Http2Agent.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/Http2Agent.java
index 4a4242376b4..44a7a7cb967 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/Http2Agent.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/Http2Agent.java
@@ -16,14 +16,12 @@
 
 package com.palantir.atlasdb.timelock;
 
+import com.ea.agentloader.AgentLoader;
 import java.lang.instrument.Instrumentation;
-
 import org.mortbay.jetty.alpn.agent.Premain;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.ea.agentloader.AgentLoader;
-
 /** A very simple wrapper around the jetty-alpn-agent for dynamic loading. */
 public final class Http2Agent {
     private Http2Agent() {}
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TemporaryConfigurationHolder.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TemporaryConfigurationHolder.java
index 3b47313bee8..dde32c50e13 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TemporaryConfigurationHolder.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TemporaryConfigurationHolder.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.atlasdb.timelock;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
 import java.io.File;
 import java.io.IOException;
-
 import org.apache.commons.io.FileUtils;
 import org.junit.rules.ExternalResource;
 import org.junit.rules.TemporaryFolder;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-
 public class TemporaryConfigurationHolder extends ExternalResource {
     @VisibleForTesting
     static final String TEMP_DATA_DIR = "";
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockCluster.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockCluster.java
index 52ffcfc0b3b..1f7c02e2050 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockCluster.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockCluster.java
@@ -15,28 +15,6 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import org.awaitility.Awaitility;
-import org.immutables.value.Value;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TemporaryFolder;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
@@ -58,8 +36,27 @@
 import com.palantir.lock.v2.WaitForLocksResponse;
 import com.palantir.timestamp.TimestampRange;
 import com.palantir.timestamp.TimestampService;
-
 import io.dropwizard.testing.ResourceHelpers;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import org.awaitility.Awaitility;
+import org.immutables.value.Value;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TemporaryFolder;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
 
 public class TestableTimelockCluster implements TestRule {
 
@@ -259,7 +256,7 @@ TimeLockUnlocker unlockerForClient(String name) {
     }
 
      CompletableFuture runWithRpcClientAsync(Function function) {
-        return CompletableFuture.supplyAsync(() -> function.apply(timelockRpcClient()));
+        return CompletableFuture.supplyAsync(() -> function.apply(timelockRpcClient()), executor);
     }
 
     TimelockRpcClient timelockRpcClient() {
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockServer.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockServer.java
index 0b10e237e74..54856073618 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockServer.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockServer.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import java.io.IOException;
-import java.net.URL;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.timelock.util.TestProxies;
@@ -31,6 +28,8 @@
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
+import java.io.IOException;
+import java.net.URL;
 
 public class TestableTimelockServer {
 
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TimeLockServerHolder.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TimeLockServerHolder.java
index 95a9864d4e6..24992076166 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TimeLockServerHolder.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TimeLockServerHolder.java
@@ -15,17 +15,14 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.function.Supplier;
-
-import org.junit.rules.ExternalResource;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.palantir.atlasdb.timelock.config.CombinedTimeLockServerConfiguration;
-
 import io.dropwizard.testing.DropwizardTestSupport;
+import java.io.File;
+import java.io.IOException;
+import java.util.function.Supplier;
+import org.junit.rules.ExternalResource;
 
 public class TimeLockServerHolder extends ExternalResource {
 
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TimeLockTestUtils.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TimeLockTestUtils.java
index f1630566780..b22371b8acd 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TimeLockTestUtils.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TimeLockTestUtils.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.atlasdb.config.AtlasDbConfig;
 import com.palantir.atlasdb.config.ImmutableAtlasDbConfig;
@@ -30,6 +25,10 @@
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
 import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
 
 public final class TimeLockTestUtils {
     private TimeLockTestUtils() {
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/ParameterInjector.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/ParameterInjector.java
index 8f516762eae..28f6ed954a4 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/ParameterInjector.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/ParameterInjector.java
@@ -16,15 +16,13 @@
 
 package com.palantir.atlasdb.timelock.util;
 
+import com.github.peterwippermann.junit4.parameterizedsuite.ParameterContext;
+import com.google.common.collect.ImmutableSet;
 import java.util.function.Supplier;
-
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 
-import com.github.peterwippermann.junit4.parameterizedsuite.ParameterContext;
-import com.google.common.collect.ImmutableSet;
-
 public final class ParameterInjector implements TestRule {
 
     private final Supplier factory;
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/TestProxies.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/TestProxies.java
index b7334bc641d..fc36d3da476 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/TestProxies.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/TestProxies.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.util;
 
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentMap;
-import java.util.stream.Collectors;
-
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
@@ -31,6 +25,11 @@
 import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
 import com.palantir.conjure.java.config.ssl.SslSocketFactories;
 import com.palantir.conjure.java.config.ssl.TrustContext;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentMap;
+import java.util.stream.Collectors;
 
 public class TestProxies {
 
diff --git a/timestamp-api/src/main/java/com/palantir/timestamp/TimestampManagementService.java b/timestamp-api/src/main/java/com/palantir/timestamp/TimestampManagementService.java
index fbe0aab8160..a1d9ade8d5b 100644
--- a/timestamp-api/src/main/java/com/palantir/timestamp/TimestampManagementService.java
+++ b/timestamp-api/src/main/java/com/palantir/timestamp/TimestampManagementService.java
@@ -15,6 +15,7 @@
  */
 package com.palantir.timestamp;
 
+import com.palantir.logsafe.Safe;
 import javax.annotation.CheckReturnValue;
 import javax.annotation.meta.When;
 import javax.ws.rs.DefaultValue;
@@ -25,8 +26,6 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.logsafe.Safe;
-
 @Path("/timestamp-management")
 public interface TimestampManagementService {
     long SENTINEL_TIMESTAMP = Long.MIN_VALUE;
diff --git a/timestamp-api/src/main/java/com/palantir/timestamp/TimestampRange.java b/timestamp-api/src/main/java/com/palantir/timestamp/TimestampRange.java
index 5a8ea210c4d..d90f230caa0 100644
--- a/timestamp-api/src/main/java/com/palantir/timestamp/TimestampRange.java
+++ b/timestamp-api/src/main/java/com/palantir/timestamp/TimestampRange.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.timestamp;
 
-import java.io.Serializable;
-import java.util.Objects;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * A TimestampRange represents an inclusive range of longs.
diff --git a/timestamp-api/src/main/java/com/palantir/timestamp/TimestampService.java b/timestamp-api/src/main/java/com/palantir/timestamp/TimestampService.java
index abc1bdd722c..accbf0fe574 100644
--- a/timestamp-api/src/main/java/com/palantir/timestamp/TimestampService.java
+++ b/timestamp-api/src/main/java/com/palantir/timestamp/TimestampService.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.timestamp;
 
+import com.palantir.logsafe.Safe;
+import com.palantir.processors.AutoDelegate;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.logsafe.Safe;
-import com.palantir.processors.AutoDelegate;
-
 /**
  * A {@link TimestampService} serves a sequence of timestamps. Requests to {@link TimestampService#getFreshTimestamp()}
  * and {@link TimestampService#getFreshTimestamps(int)} should return results that are unique and increasing, in that
diff --git a/timestamp-client/src/main/java/com/palantir/timestamp/RequestBatchingTimestampService.java b/timestamp-client/src/main/java/com/palantir/timestamp/RequestBatchingTimestampService.java
index 57090c3d5d6..5b87ec30126 100644
--- a/timestamp-client/src/main/java/com/palantir/timestamp/RequestBatchingTimestampService.java
+++ b/timestamp-client/src/main/java/com/palantir/timestamp/RequestBatchingTimestampService.java
@@ -16,12 +16,6 @@
 
 package com.palantir.timestamp;
 
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.function.Consumer;
-
-import javax.annotation.concurrent.ThreadSafe;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.primitives.Ints;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -33,6 +27,10 @@
 import com.palantir.logsafe.Preconditions;
 import com.palantir.util.jmx.OperationTimer;
 import com.palantir.util.timer.LoggingOperationTimer;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Consumer;
+import javax.annotation.concurrent.ThreadSafe;
 
 /**
  * This uses smart batching to queue up requests and send them all as one larger batch.
diff --git a/timestamp-client/src/test/java/com/palantir/timestamp/RequestBatchingTimestampServiceTest.java b/timestamp-client/src/test/java/com/palantir/timestamp/RequestBatchingTimestampServiceTest.java
index f77bf8c3f2c..a9adeabbefe 100644
--- a/timestamp-client/src/test/java/com/palantir/timestamp/RequestBatchingTimestampServiceTest.java
+++ b/timestamp-client/src/test/java/com/palantir/timestamp/RequestBatchingTimestampServiceTest.java
@@ -17,7 +17,6 @@
 package com.palantir.timestamp;
 
 import static java.util.stream.Collectors.toList;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertFalse;
@@ -27,10 +26,13 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.SettableFuture;
+import com.palantir.atlasdb.autobatch.BatchElement;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.immutables.value.Value;
 import org.junit.After;
 import org.junit.Before;
@@ -39,11 +41,6 @@
 import org.mockito.Spy;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import com.google.common.collect.Lists;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.SettableFuture;
-import com.palantir.atlasdb.autobatch.BatchElement;
-
 @RunWith(MockitoJUnitRunner.class)
 public final class RequestBatchingTimestampServiceTest {
     private static final int MAX_TIMESTAMPS = 10_000;
diff --git a/timestamp-impl/src/main/java/com/palantir/timestamp/DebugLogger.java b/timestamp-impl/src/main/java/com/palantir/timestamp/DebugLogger.java
index bac9b5373f3..35b81da4fcf 100644
--- a/timestamp-impl/src/main/java/com/palantir/timestamp/DebugLogger.java
+++ b/timestamp-impl/src/main/java/com/palantir/timestamp/DebugLogger.java
@@ -15,13 +15,11 @@
  */
 package com.palantir.timestamp;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This is a logger intended for use tracking down problems arising from
diff --git a/timestamp-impl/src/main/java/com/palantir/timestamp/PersistentTimestampServiceImpl.java b/timestamp-impl/src/main/java/com/palantir/timestamp/PersistentTimestampServiceImpl.java
index 6400e8d54d1..ccef62b8283 100644
--- a/timestamp-impl/src/main/java/com/palantir/timestamp/PersistentTimestampServiceImpl.java
+++ b/timestamp-impl/src/main/java/com/palantir/timestamp/PersistentTimestampServiceImpl.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.timestamp;
 
-import javax.annotation.concurrent.ThreadSafe;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.palantir.async.initializer.AsyncInitializer;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.logsafe.SafeArg;
+import javax.annotation.concurrent.ThreadSafe;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @ThreadSafe
 public class PersistentTimestampServiceImpl implements PersistentTimestampService {
diff --git a/timestamp-impl/src/main/java/com/palantir/timestamp/TimestampAllocationFailures.java b/timestamp-impl/src/main/java/com/palantir/timestamp/TimestampAllocationFailures.java
index 1c469b53413..4dc21bbd634 100644
--- a/timestamp-impl/src/main/java/com/palantir/timestamp/TimestampAllocationFailures.java
+++ b/timestamp-impl/src/main/java/com/palantir/timestamp/TimestampAllocationFailures.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.timestamp;
 
-import javax.annotation.concurrent.ThreadSafe;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.common.remoting.ServiceNotAvailableException;
 import com.palantir.logsafe.exceptions.SafeRuntimeException;
+import javax.annotation.concurrent.ThreadSafe;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @ThreadSafe
 public class TimestampAllocationFailures {
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/AtomicTimestampTests.java b/timestamp-impl/src/test/java/com/palantir/timestamp/AtomicTimestampTests.java
index 5c47695a379..9cdd7b3fc8b 100644
--- a/timestamp-impl/src/test/java/com/palantir/timestamp/AtomicTimestampTests.java
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/AtomicTimestampTests.java
@@ -22,7 +22,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-
 import org.junit.After;
 import org.junit.Test;
 
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/ErrorCheckingTimestampBoundStoreTest.java b/timestamp-impl/src/test/java/com/palantir/timestamp/ErrorCheckingTimestampBoundStoreTest.java
index d659943a3e1..5245e0f45fb 100644
--- a/timestamp-impl/src/test/java/com/palantir/timestamp/ErrorCheckingTimestampBoundStoreTest.java
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/ErrorCheckingTimestampBoundStoreTest.java
@@ -23,12 +23,11 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.palantir.exception.PalantirInterruptedException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import com.palantir.exception.PalantirInterruptedException;
-
 public class ErrorCheckingTimestampBoundStoreTest {
 
     @Rule
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceMockingTest.java b/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceMockingTest.java
index 7ef71724bc0..2ce0cb1557f 100644
--- a/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceMockingTest.java
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceMockingTest.java
@@ -77,4 +77,3 @@ public void shouldRejectFastForwardToTheSentinelValue() {
         timestampService.fastForwardTimestamp(TimestampManagementService.SENTINEL_TIMESTAMP);
     }
 }
-
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceTests.java b/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceTests.java
index d438d44e844..a4e490b09b8 100644
--- a/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceTests.java
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceTests.java
@@ -19,13 +19,12 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.lessThan;
 
+import com.palantir.atlasdb.timestamp.AbstractTimestampServiceTests;
+import com.palantir.common.remoting.ServiceNotAvailableException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import com.palantir.atlasdb.timestamp.AbstractTimestampServiceTests;
-import com.palantir.common.remoting.ServiceNotAvailableException;
-
 // Test PersistentTimestampServiceImpl by fully instantiating it with an InMemoryTimestampBoundStore.
 // See also PersistentTimestampServiceMockingTest that mocks AvailableTimestamps instead.
 public class PersistentTimestampServiceTests extends AbstractTimestampServiceTests {
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampTests.java b/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampTests.java
index ed205cee1e9..4211366e839 100644
--- a/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampTests.java
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampTests.java
@@ -76,4 +76,3 @@ public void shouldHandOutRangesOfTheCorrectSize() {
     }
 
 }
-
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampAllocationFailuresTest.java b/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampAllocationFailuresTest.java
index 7ff646833b0..7e386a38da4 100644
--- a/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampAllocationFailuresTest.java
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampAllocationFailuresTest.java
@@ -24,13 +24,12 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
+import com.palantir.common.remoting.ServiceNotAvailableException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.slf4j.Logger;
 
-import com.palantir.common.remoting.ServiceNotAvailableException;
-
 public class TimestampAllocationFailuresTest {
     private static final RuntimeException FAILURE = new IllegalStateException();
     private static final ServiceNotAvailableException SERVICE_NOT_AVAILABLE_EXCEPTION =
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampRangesTest.java b/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampRangesTest.java
index 230fb89b86b..f4d7977b452 100644
--- a/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampRangesTest.java
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampRangesTest.java
@@ -20,7 +20,6 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.stream.LongStream;
-
 import org.junit.Test;
 
 public class TimestampRangesTest {