From 9a3db16ad3a5494b5ecf2213de5cfabe1b894501 Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Wed, 15 Sep 2021 15:02:02 +0000 Subject: [PATCH] Excavator: Upgrades Baseline to the latest version --- .baseline/checkstyle/checkstyle.xml | 4 +++- .../SnapshotsMetadataCleanupTask.java | 20 +++++++++---------- .../generated/DataMetadataCleanupTask.java | 20 +++++++++---------- .../HotspottyDataMetadataCleanupTask.java | 20 +++++++++---------- .../generated/ValueMetadataCleanupTask.java | 20 +++++++++---------- .../StreamTestMaxMemMetadataCleanupTask.java | 20 +++++++++---------- .../StreamTestMetadataCleanupTask.java | 20 +++++++++---------- ...StreamTestWithHashMetadataCleanupTask.java | 20 +++++++++---------- ...TestHashComponentsMetadataCleanupTask.java | 20 +++++++++---------- build.gradle | 2 +- .../UserPhotosMetadataCleanupTask.java | 20 +++++++++---------- 11 files changed, 94 insertions(+), 92 deletions(-) diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml index 494192ad906..1a086c49c8e 100644 --- a/.baseline/checkstyle/checkstyle.xml +++ b/.baseline/checkstyle/checkstyle.xml @@ -63,7 +63,9 @@ - + + + diff --git a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsMetadataCleanupTask.java b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsMetadataCleanupTask.java index 6e860c54d2a..acc75edffbe 100644 --- a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsMetadataCleanupTask.java +++ b/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; diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataMetadataCleanupTask.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataMetadataCleanupTask.java index 9225ae405a5..9f7a91a63bd 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataMetadataCleanupTask.java +++ b/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; diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataMetadataCleanupTask.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataMetadataCleanupTask.java index f6080b60e3e..f9f702458c8 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataMetadataCleanupTask.java +++ b/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; diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueMetadataCleanupTask.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueMetadataCleanupTask.java index 0bc76518b32..f9166c7e19a 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueMetadataCleanupTask.java +++ b/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; diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemMetadataCleanupTask.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemMetadataCleanupTask.java index 5a61ec52896..c1e9d8dde69 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemMetadataCleanupTask.java +++ b/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; diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMetadataCleanupTask.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMetadataCleanupTask.java index 3517a378a51..6636a9865e7 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMetadataCleanupTask.java +++ b/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; diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashMetadataCleanupTask.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashMetadataCleanupTask.java index f9c229762aa..341338c1080 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashMetadataCleanupTask.java +++ b/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; diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsMetadataCleanupTask.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsMetadataCleanupTask.java index 63deccb3ed0..c85b938f613 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsMetadataCleanupTask.java +++ b/atlasdb-tests-shared/src/test/java/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 index 822e75fa649..da9aa37c2b3 100644 --- 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/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosMetadataCleanupTask.java b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosMetadataCleanupTask.java index f5713dfd6e7..e8dcc78a16f 100644 --- a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosMetadataCleanupTask.java +++ b/examples/profile-client/src/main/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;