Excavator: Upgrades Baseline to the latest version

palantir · Sep 24, 2021 · 588787d · 588787d
1 parent 145f0a0
commit 588787d
Show file tree

Hide file tree

Showing 12 changed files with 95 additions and 94 deletions.
diff --git a/.baseline/checkstyle/checkstyle.xml b/.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"/>

diff --git a/atlasdb-autobatch/src/test/java/com/palantir/atlasdb/autobatch/AutobatchersTests.java b/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)

diff --git a/...utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsMetadataCleanupTask.java b/...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;
 

diff --git a/...-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataMetadataCleanupTask.java b/...-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;
 

diff --git a/...s/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataMetadataCleanupTask.java b/...s/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;
 

diff --git a/...main/java/com/palantir/atlasdb/performance/schema/generated/ValueMetadataCleanupTask.java b/...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;
 

diff --git a/...ava/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemMetadataCleanupTask.java b/...ava/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;
 

diff --git a/...test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMetadataCleanupTask.java b/...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;
 

diff --git a/...a/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashMetadataCleanupTask.java b/...a/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;
 

diff --git a/...a/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsMetadataCleanupTask.java b/...a/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsMetadataCleanupTask.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 TestHashComponentsMetadataCleanupTask implements OnCleanupTask {
 
-    private static final Logger log = LoggerFactory.getLogger(TestHashComponentsMetadataCleanupTask.class);
+    private static final SafeLogger log = SafeLoggerFactory.get(TestHashComponentsMetadataCleanupTask.class);
 
     private final StreamTestTableFactory tables;
 

diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         classpath 'com.netflix.nebula:gradle-info-plugin:10.1.3'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:17.3.3'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.4.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:4.16.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:4.25.0'
         classpath 'com.palantir.gradle.conjure:gradle-conjure:5.12.0'
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.2.0'
         classpath 'com.palantir.metricschema:gradle-metric-schema:0.8.0'

diff --git a/...ain/java/com/palantir/example/profile/schema/generated/UserPhotosMetadataCleanupTask.java b/...ain/java/com/palantir/example/profile/schema/generated/UserPhotosMetadataCleanupTask.java
@@ -1,14 +1,5 @@
 package com.palantir.example.profile.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 UserPhotosMetadataCleanupTask implements OnCleanupTask {
 
-    private static final Logger log = LoggerFactory.getLogger(UserPhotosMetadataCleanupTask.class);
+    private static final SafeLogger log = SafeLoggerFactory.get(UserPhotosMetadataCleanupTask.class);
 
     private final ProfileTableFactory tables;