Excavator: Upgrades Baseline to the latest version

.baseline/checkstyle/checkstyle.xml

@@ -63,7 +63,9 @@
             <property name="tokens" value="VARIABLE_DEF"/>
             <property name="allowSamelineMultipleAnnotations" value="true"/>
         </module>
-        <module name="AnnotationUseStyle"/> <!-- Java Style Guide: Annotations -->
+        <module name="AnnotationUseStyle"> <!-- Java Style Guide: Annotations -->
+            <property name="trailingArrayComma" value="ignore"/>
+        </module>
         <module name="ArrayTypeStyle"/> <!-- Java Style Guide: No C-style array declarations -->
         <module name="AvoidEscapedUnicodeCharacters"> <!-- Java Style Guide: Non-ASCII characters -->
             <property name="allowEscapesForControlCharacters" value="true"/>

atlasdb-autobatch/src/test/java/com/palantir/atlasdb/autobatch/AutobatchersTests.java

@@ -25,7 +25,6 @@
 import java.time.Duration;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicLong;
 import org.junit.Test;
@@ -49,7 +48,7 @@ public void testTimeoutThrowsHandlerException() {
         RuntimeException runtimeException = new RuntimeException("Caught exception");
 
         DisruptorAutobatcher<Object, Object> autobatcher = Autobatchers.independent(
-                        list -> Uninterruptibles.sleepUninterruptibly(30, TimeUnit.SECONDS))
+                        list -> Uninterruptibles.sleepUninterruptibly(Duration.ofSeconds(30)))
                 .batchFunctionTimeout(Duration.ofSeconds(1))
                 .safeLoggablePurpose("testing")
                 .timeoutHandler(_exception -> runtimeException)

atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolingContainer.java

@@ -120,7 +120,7 @@ public <V, K extends Exception> V runWithPooledResource(FunctionCheckedException
             openRequests.getAndIncrement();
             return runWithGoodResource(fn);
         } catch (Throwable t) {
-            log.warn("Error occurred talking to host '{}': {}", SafeArg.of("host", CassandraLogHelper.host(host)), t);
+            log.warn("Error occurred talking to host '{}'", SafeArg.of("host", CassandraLogHelper.host(host)), t);
             if (t instanceof NoSuchElementException && t.getMessage().contains("Pool exhausted")) {
                 log.warn(
                         "Extra information about exhausted pool",

atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/IterablePartitioner.java

@@ -32,6 +32,7 @@
 import org.slf4j.LoggerFactory;
 
 public final class IterablePartitioner {
+    @SuppressWarnings("PreferSafeLogger") // Nontrivial refactor
     private static final Logger log = LoggerFactory.getLogger(IterablePartitioner.class);
 
     private static final String ENTRY_TOO_BIG_MESSAGE = "Encountered an entry of approximate size {} bytes,"

atlasdb-client/src/main/java/com/palantir/atlasdb/logging/KvsProfilingLogger.java

@@ -37,7 +37,10 @@ public class KvsProfilingLogger {
 
     public static final String SLOW_LOGGER_NAME = "kvs-slow-log-2";
 
+    @SuppressWarnings("PreferSafeLogger") // May be used externally. Don't force an api break
     public static final Logger slowlogger = LoggerFactory.getLogger(SLOW_LOGGER_NAME);
+
+    @SuppressWarnings("PreferSafeLogger") // Nontrivial refactoring
     private static final Logger log = LoggerFactory.getLogger(KvsProfilingLogger.class);
 
     public static final int DEFAULT_THRESHOLD_MILLIS = 1000;

atlasdb-commons/src/main/java/com/palantir/util/AssertUtils.java

@@ -43,6 +43,7 @@ public class AssertUtils {
      * this will stay, just deprecated.
      */
     @Deprecated
+    @SuppressWarnings("PreferSafeLogger") // API exposures accept arbitrary Objects which may not be Args
     private static final Logger log = LoggerFactory.getLogger(AssertUtils.class);
 
     public static <T> boolean nonNullItems(Collection<T> c) {

atlasdb-commons/src/main/java/com/palantir/util/JMXUtils.java

@@ -151,7 +151,7 @@ public static void unregisterMBeanCatchAndLogExceptions(final String objectName)
             final ObjectName on = new ObjectName(objectName);
             server.unregisterMBean(on);
         } catch (final Exception e) {
-            log.info("Failed to unregister mbean for name {}", e);
+            log.info("Failed to unregister mbean", e);
         }
     }
 

atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTable.java

@@ -40,7 +40,7 @@
 import org.slf4j.helpers.MessageFormatter;
 
 public class PostgresDdlTable implements DbDdlTable {
-    @SuppressWarnings("ConsistentLoggerName")
+    @SuppressWarnings({"ConsistentLoggerName", "PreferSafeLogger"})
     private static final Logger oldLog = LoggerFactory.getLogger(PostgresDdlTable.class);
 
     private static final SafeLogger log = SafeLoggerFactory.get(PostgresDdlTable.class);

atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsMetadataCleanupTask.java

@@ -1,14 +1,5 @@
 package com.palantir.atlasdb.todo.generated;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.cleaner.api.OnCleanupTask;
@@ -22,10 +13,19 @@
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.logger.SafeLogger;
+import com.palantir.logsafe.logger.SafeLoggerFactory;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SnapshotsMetadataCleanupTask implements OnCleanupTask {
 
-    private static final Logger log = LoggerFactory.getLogger(SnapshotsMetadataCleanupTask.class);
+    private static final SafeLogger log = SafeLoggerFactory.get(SnapshotsMetadataCleanupTask.class);
 
     private final TodoSchemaTableFactory tables;
 

atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataMetadataCleanupTask.java

@@ -1,14 +1,5 @@
 package com.palantir.atlasdb.blob.generated;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.cleaner.api.OnCleanupTask;
@@ -22,10 +13,19 @@
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.logger.SafeLogger;
+import com.palantir.logsafe.logger.SafeLoggerFactory;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DataMetadataCleanupTask implements OnCleanupTask {
 
-    private static final Logger log = LoggerFactory.getLogger(DataMetadataCleanupTask.class);
+    private static final SafeLogger log = SafeLoggerFactory.get(DataMetadataCleanupTask.class);
 
     private final BlobSchemaTableFactory tables;
 

atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataMetadataCleanupTask.java

@@ -1,14 +1,5 @@
 package com.palantir.atlasdb.blob.generated;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.cleaner.api.OnCleanupTask;
@@ -22,10 +13,19 @@
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.logger.SafeLogger;
+import com.palantir.logsafe.logger.SafeLoggerFactory;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class HotspottyDataMetadataCleanupTask implements OnCleanupTask {
 
-    private static final Logger log = LoggerFactory.getLogger(HotspottyDataMetadataCleanupTask.class);
+    private static final SafeLogger log = SafeLoggerFactory.get(HotspottyDataMetadataCleanupTask.class);
 
     private final BlobSchemaTableFactory tables;
 

atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransaction.java

@@ -175,8 +175,6 @@
 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.
@@ -192,7 +190,7 @@
  */
 public class SnapshotTransaction extends AbstractTransaction implements ConstraintCheckingTransaction {
     private static final SafeLogger log = SafeLoggerFactory.get(SnapshotTransaction.class);
-    private static final Logger perfLogger = LoggerFactory.getLogger("dualschema.perf");
+    private static final SafeLogger perfLogger = SafeLoggerFactory.get("dualschema.perf");
     private static final SafeLogger constraintLogger = SafeLoggerFactory.get("dualschema.constraints");
 
     private static final int BATCH_SIZE_GET_FIRST_PAGE = 1000;
@@ -404,10 +402,10 @@ private NavigableMap<byte[], RowResult<byte[]>> getRowsInternal(
         if (perfLogger.isDebugEnabled()) {
             perfLogger.debug(
                     "getRows({}, {} rows) found {} rows, took {} ms",
-                    tableRef,
-                    Iterables.size(rows),
-                    results.size(),
-                    getRowsMillis);
+                    LoggingArgs.tableRef(tableRef),
+                    SafeArg.of("numRows", Iterables.size(rows)),
+                    SafeArg.of("resultSize", results.size()),
+                    SafeArg.of("timeTakenMillis", getRowsMillis));
         }
         validatePreCommitRequirementsOnReadIfNecessary(tableRef, getStartTimestamp());
         return results;
@@ -916,7 +914,10 @@ public Iterable<BatchingVisitable<RowResult<byte[]>>> getRanges(
 
         if (perfLogger.isDebugEnabled()) {
             perfLogger.debug(
-                    "Passed {} ranges to getRanges({}, {})", Iterables.size(rangeRequests), tableRef, rangeRequests);
+                    "Passed {} ranges to getRanges({}, {})",
+                    SafeArg.of("numRanges", Iterables.size(rangeRequests)),
+                    LoggingArgs.tableRef(tableRef),
+                    UnsafeArg.of("rangeRequests", rangeRequests));
         }
         if (!Iterables.isEmpty(rangeRequests)) {
             hasReads = true;
@@ -1771,7 +1772,10 @@ public void commit(TransactionService transactionService) {
             commitWrites(transactionService);
             if (perfLogger.isDebugEnabled()) {
                 long transactionMillis = TimeUnit.NANOSECONDS.toMillis(transactionTimerContext.stop());
-                perfLogger.debug("Committed transaction {} in {}ms", getStartTimestamp(), transactionMillis);
+                perfLogger.debug(
+                        "Committed transaction {} in {}ms",
+                        SafeArg.of("startTimestamp", getStartTimestamp()),
+                        SafeArg.of("transactionTimeMillis", transactionMillis));
             }
             success = true;
         } finally {

atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueMetadataCleanupTask.java

@@ -1,14 +1,5 @@
 package com.palantir.atlasdb.performance.schema.generated;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.cleaner.api.OnCleanupTask;
@@ -22,10 +13,19 @@
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.logger.SafeLogger;
+import com.palantir.logsafe.logger.SafeLoggerFactory;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ValueMetadataCleanupTask implements OnCleanupTask {
 
-    private static final Logger log = LoggerFactory.getLogger(ValueMetadataCleanupTask.class);
+    private static final SafeLogger log = SafeLoggerFactory.get(ValueMetadataCleanupTask.class);
 
     private final StreamTestTableFactory tables;
 

atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemMetadataCleanupTask.java

@@ -1,14 +1,5 @@
 package com.palantir.atlasdb.schema.stream.generated;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.cleaner.api.OnCleanupTask;
@@ -22,10 +13,19 @@
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.logger.SafeLogger;
+import com.palantir.logsafe.logger.SafeLoggerFactory;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class StreamTestMaxMemMetadataCleanupTask implements OnCleanupTask {
 
-    private static final Logger log = LoggerFactory.getLogger(StreamTestMaxMemMetadataCleanupTask.class);
+    private static final SafeLogger log = SafeLoggerFactory.get(StreamTestMaxMemMetadataCleanupTask.class);
 
     private final StreamTestTableFactory tables;
 

atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMetadataCleanupTask.java

@@ -1,14 +1,5 @@
 package com.palantir.atlasdb.schema.stream.generated;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.cleaner.api.OnCleanupTask;
@@ -22,10 +13,19 @@
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.logger.SafeLogger;
+import com.palantir.logsafe.logger.SafeLoggerFactory;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class StreamTestMetadataCleanupTask implements OnCleanupTask {
 
-    private static final Logger log = LoggerFactory.getLogger(StreamTestMetadataCleanupTask.class);
+    private static final SafeLogger log = SafeLoggerFactory.get(StreamTestMetadataCleanupTask.class);
 
     private final StreamTestTableFactory tables;
 

atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashMetadataCleanupTask.java

@@ -1,14 +1,5 @@
 package com.palantir.atlasdb.schema.stream.generated;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.cleaner.api.OnCleanupTask;
@@ -22,10 +13,19 @@
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.logger.SafeLogger;
+import com.palantir.logsafe.logger.SafeLoggerFactory;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class StreamTestWithHashMetadataCleanupTask implements OnCleanupTask {
 
-    private static final Logger log = LoggerFactory.getLogger(StreamTestWithHashMetadataCleanupTask.class);
+    private static final SafeLogger log = SafeLoggerFactory.get(StreamTestWithHashMetadataCleanupTask.class);
 
     private final StreamTestTableFactory tables;