Excavator: Upgrades Baseline to the latest version

.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" }}

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

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.

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

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() { }

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;
 
 /**

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;

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

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

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;
         }
     }

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.

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,

atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelection.java

@@ -15,18 +15,17 @@
  */
 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;
 import com.google.common.base.MoreObjects;
 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;

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;

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;

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.

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.

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("");

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.

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

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() {

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.";