Skip to content
This repository has been archived by the owner on Nov 14, 2024. It is now read-only.

Excavator: Upgrades Baseline to the latest version #5640

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .baseline/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down