From 0d9afb528ae7a2b819f0e2ed364e36934e6f7018 Mon Sep 17 00:00:00 2001 From: Gokcan Ozakdag Date: Thu, 9 May 2019 16:09:40 +0100 Subject: [PATCH] Gozakdag/revert supplier change (#3995) * Revert "Remove usages of guava Supplier (#3978)" This reverts commit 17864ae384eea1d6ac317f58b0f016eea32671ad. * use guava supplier --- .../transaction/api/TransactionManager.java | 3 +- .../atlasdb/versions/AtlasDbVersion.java | 4 +- .../CassandraKeyValueServiceImpl.java | 2 +- .../keyvalue/cassandra/RangeLoader.java | 3 +- .../paging/CassandraRangePagingIterable.java | 2 +- .../pool/CassandraClientPoolMetrics.java | 2 +- .../generated/AllValueTypesTestTable.java | 4 +- .../generated/ApiTestTableFactory.java | 15 ++-- .../generated/HashComponentsTestTable.java | 4 +- .../generated/SchemaApiTestTable.java | 4 +- .../atlasdb/cache/TimestampCache.java | 3 +- .../atlasdb/schema/CompactSchema.java | 2 +- .../palantir/atlasdb/schema/SweepSchema.java | 2 +- .../generated/CompactMetadataTable.java | 4 +- .../schema/generated/CompactTableFactory.java | 9 +-- .../schema/generated/SweepIdToNameTable.java | 2 +- .../schema/generated/SweepNameToIdTable.java | 2 +- .../schema/generated/SweepPriorityTable.java | 4 +- .../generated/SweepShardProgressTable.java | 2 +- .../schema/generated/SweepTableFactory.java | 9 +-- .../schema/generated/SweepableCellsTable.java | 2 +- .../generated/SweepableTimestampsTable.java | 2 +- .../schema/generated/TableClearsTable.java | 2 +- .../generated/TargetedSweepTableFactory.java | 7 +- .../schema/stream/StreamStoreDefinition.java | 2 +- .../ColumnMetadataDescription.java | 2 + .../table/description/IndexMetadata.java | 1 + .../atlasdb/table/description/Schema.java | 2 +- .../description/render/TableRenderer.java | 2 +- ...tractConditionAwareTransactionManager.java | 3 +- .../transaction/impl/RecomputingSupplier.java | 3 +- .../atlasdb/table/description/SchemaTest.java | 2 + .../generated/GenericRangeScanTestTable.java | 4 +- .../GenericTestSchemaTableFactory.java | 15 ++-- .../generated/RangeScanTestTable.java | 4 +- .../palantir/async/initializer/Callback.java | 2 + .../com/palantir/common/proxy/DelayProxy.java | 2 +- .../common/proxy/MultiDelegateProxy.java | 2 +- .../concurrent/CoalescingSupplierTest.java | 1 + .../ServiceDiscoveringAtlasSupplier.java | 4 +- .../atlasdb/factory/TransactionManagers.java | 4 +- .../keyvalue/dbkvs/OracleDdlConfig.java | 2 +- .../impl/ConnectionManagerAwareDbKvs.java | 2 +- .../dbkvs/impl/ConnectionSupplier.java | 2 +- .../keyvalue/dbkvs/impl/DbReadTable.java | 2 +- .../dbkvs/impl/SqlConnectionSupplier.java | 2 +- .../impl/oracle/OverflowSequenceSupplier.java | 3 +- .../dbkvs/impl/ranges/DbKvsGetRanges.java | 2 +- .../todo/generated/LatestSnapshotTable.java | 4 +- .../todo/generated/NamespacedTodoTable.java | 4 +- .../SnapshotsStreamHashAidxTable.java | 4 +- .../generated/SnapshotsStreamIdxTable.java | 4 +- .../SnapshotsStreamMetadataTable.java | 4 +- .../todo/generated/SnapshotsStreamStore.java | 4 +- .../generated/SnapshotsStreamValueTable.java | 4 +- .../generated/TodoSchemaTableFactory.java | 30 +++----- .../atlasdb/todo/generated/TodoTable.java | 4 +- .../blob/generated/AuditedDataTable.java | 4 +- .../generated/BlobSchemaTableFactory.java | 36 ++++------ .../generated/DataStreamHashAidxTable.java | 4 +- .../blob/generated/DataStreamIdxTable.java | 4 +- .../generated/DataStreamMetadataTable.java | 4 +- .../blob/generated/DataStreamStore.java | 4 +- .../blob/generated/DataStreamValueTable.java | 4 +- .../HotspottyDataStreamHashAidxTable.java | 4 +- .../HotspottyDataStreamIdxTable.java | 4 +- .../HotspottyDataStreamMetadataTable.java | 4 +- .../generated/HotspottyDataStreamStore.java | 4 +- .../HotspottyDataStreamValueTable.java | 4 +- .../CheckAndSetSchemaTableFactory.java | 12 ++-- .../cas/generated/CheckAndSetTable.java | 4 +- .../atlasdb/cleaner/AsyncPuncher.java | 2 +- .../cleaner/DefaultCleanerBuilder.java | 2 +- .../cleaner/ImmutableTimestampSupplier.java | 2 +- .../com/palantir/atlasdb/cleaner/Puncher.java | 2 +- .../palantir/atlasdb/cleaner/Scrubber.java | 2 +- .../atlasdb/cleaner/SimpleCleaner.java | 3 +- .../atlasdb/cleaner/SimplePuncher.java | 3 +- .../AdjustableSweepBatchConfigSource.java | 2 +- .../atlasdb/sweep/BackgroundSweeperImpl.java | 2 +- .../AbstractLockAwareTransactionManager.java | 3 +- .../impl/AdvisoryLockConditionSuppliers.java | 2 +- .../impl/ReadOnlyTransactionManager.java | 3 +- .../impl/SerializableTransaction.java | 2 +- .../impl/SerializableTransactionManager.java | 2 +- ...ShouldNotDeleteAndRollbackTransaction.java | 2 +- .../transaction/impl/SnapshotTransaction.java | 2 +- .../impl/SnapshotTransactionManager.java | 2 +- .../impl/WrappingTransactionManager.java | 3 +- .../impl/metrics/TransactionOutcome.java | 3 +- .../impl/AdvisoryLocksConditionTest.java | 2 +- .../atlasdb/jdbc/JdbcKeyValueSharedTest.java | 3 +- .../schema/generated/KeyValueTable.java | 2 +- .../generated/ValueMetadataCleanupTask.java | 1 + .../generated/ValueStreamHashAidxTable.java | 2 +- .../schema/generated/ValueStreamIdxTable.java | 2 +- .../generated/ValueStreamMetadataTable.java | 2 +- .../generated/ValueStreamValueTable.java | 2 +- .../atlasdb/sweep/SweepTestUtils.java | 3 +- .../palantir/atlasdb/cleaner/PuncherTest.java | 2 +- .../atlasdb/keyvalue/impl/TableTasksTest.java | 2 +- .../schema/indexing/generated/DataTable.java | 4 +- .../generated/IndexTestTableFactory.java | 15 ++-- .../indexing/generated/TwoColumnsTable.java | 4 +- .../stream/generated/KeyValueTable.java | 4 +- .../StreamTestMaxMemStreamHashAidxTable.java | 4 +- .../StreamTestMaxMemStreamIdxTable.java | 4 +- .../StreamTestMaxMemStreamMetadataTable.java | 4 +- .../StreamTestMaxMemStreamStore.java | 4 +- .../StreamTestMaxMemStreamValueTable.java | 4 +- .../StreamTestStreamHashAidxTable.java | 4 +- .../generated/StreamTestStreamIdxTable.java | 4 +- .../StreamTestStreamMetadataTable.java | 4 +- .../generated/StreamTestStreamStore.java | 4 +- .../generated/StreamTestStreamValueTable.java | 4 +- .../generated/StreamTestTableFactory.java | 72 +++++++------------ ...StreamTestWithHashStreamHashAidxTable.java | 4 +- .../StreamTestWithHashStreamIdxTable.java | 4 +- ...StreamTestWithHashStreamMetadataTable.java | 4 +- .../StreamTestWithHashStreamStore.java | 4 +- .../StreamTestWithHashStreamValueTable.java | 4 +- ...TestHashComponentsStreamHashAidxTable.java | 4 +- .../TestHashComponentsStreamIdxTable.java | 4 +- ...TestHashComponentsStreamMetadataTable.java | 4 +- .../TestHashComponentsStreamStore.java | 4 +- .../TestHashComponentsStreamValueTable.java | 4 +- .../impl/SnapshotTransactionTest.java | 2 +- .../palantir/nexus/db/ConnectionSupplier.java | 2 +- .../ConnectionBackedSqlConnectionImpl.java | 2 +- docs/source/release_notes/release-notes.rst | 4 -- .../schema/generated/ProfileTableFactory.java | 21 ++---- .../UserPhotosStreamHashAidxTable.java | 4 +- .../generated/UserPhotosStreamIdxTable.java | 4 +- .../UserPhotosStreamMetadataTable.java | 4 +- .../generated/UserPhotosStreamStore.java | 4 +- .../generated/UserPhotosStreamValueTable.java | 4 +- .../schema/generated/UserProfileTable.java | 4 +- .../leader/proxy/AwaitingLeadershipProxy.java | 2 +- .../proxy/AwaitingLeadershipProxyTest.java | 2 +- .../lock/impl/LegacyTimelockService.java | 4 ++ .../palantir/lock/impl/LockServiceImpl.java | 4 +- .../lock/impl/LegacyTimelockServiceTest.java | 1 + .../timelock/AsyncTimelockResource.java | 14 ++-- .../timelock/lock/AsyncLockService.java | 2 +- .../paxos/PaxosTimestampBoundStoreTest.java | 2 + .../generated/BenchmarksTableFactory.java | 7 +- .../generated/BlobsSerializableTable.java | 2 +- .../schema/generated/BlobsTable.java | 2 +- .../generated/KvDynamicColumnsTable.java | 2 +- .../schema/generated/KvRowsTable.java | 2 +- .../schema/generated/MetadataTable.java | 2 +- 151 files changed, 305 insertions(+), 367 deletions(-) diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionManager.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionManager.java index efe557e78b6..af3ffd5c30f 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionManager.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionManager.java @@ -15,8 +15,7 @@ */ package com.palantir.atlasdb.transaction.api; -import java.util.function.Supplier; - +import com.google.common.base.Supplier; import com.palantir.atlasdb.cleaner.api.Cleaner; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.transaction.service.TransactionService; diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/versions/AtlasDbVersion.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/versions/AtlasDbVersion.java index f49c4f376df..01529721914 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/versions/AtlasDbVersion.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/versions/AtlasDbVersion.java @@ -20,8 +20,8 @@ import java.io.InputStreamReader; import java.io.PrintStream; import java.nio.charset.StandardCharsets; -import java.util.function.Supplier; +import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.google.common.io.CharStreams; @@ -33,7 +33,7 @@ public final class AtlasDbVersion { private static volatile boolean versionPrinted = false; - private static final Supplier version = Suppliers.memoize(AtlasDbVersion::readVersion); + private static final Supplier version = Suppliers.memoize(() -> readVersion()); private AtlasDbVersion() { // static class diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceImpl.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceImpl.java index 59d125254da..f06a7c91dc8 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceImpl.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceImpl.java @@ -266,7 +266,7 @@ public static CassandraKeyValueService create( public static CassandraKeyValueService create( MetricsManager metricsManager, CassandraKeyValueServiceConfig config, - Supplier runtimeConfig, + java.util.function.Supplier runtimeConfig, CassandraMutationTimestampProvider mutationTimestampProvider, boolean initializeAsync) { return create(metricsManager, diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RangeLoader.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RangeLoader.java index 54895ce0ff7..38dc10c84ed 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RangeLoader.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RangeLoader.java @@ -16,11 +16,10 @@ package com.palantir.atlasdb.keyvalue.cassandra; -import java.util.function.Supplier; - import org.apache.cassandra.thrift.ConsistencyLevel; import org.apache.cassandra.thrift.SlicePredicate; +import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.keyvalue.api.RangeRequest; import com.palantir.atlasdb.keyvalue.api.RowResult; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/CassandraRangePagingIterable.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/CassandraRangePagingIterable.java index 84eedc8ed5a..2a5b773a67a 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/CassandraRangePagingIterable.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/CassandraRangePagingIterable.java @@ -18,13 +18,13 @@ import java.nio.ByteBuffer; import java.util.List; import java.util.Map; -import java.util.function.Supplier; import org.apache.cassandra.thrift.ColumnOrSuperColumn; import org.apache.cassandra.thrift.KeyRange; import org.apache.cassandra.thrift.KeySlice; import org.apache.cassandra.thrift.SlicePredicate; +import com.google.common.base.Supplier; import com.palantir.atlasdb.keyvalue.api.ColumnSelection; import com.palantir.atlasdb.keyvalue.api.RangeRequest; import com.palantir.atlasdb.keyvalue.api.RangeRequests; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraClientPoolMetrics.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraClientPoolMetrics.java index f6ca865ed6d..4025ed62b74 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraClientPoolMetrics.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraClientPoolMetrics.java @@ -19,9 +19,9 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Consumer; -import java.util.function.Supplier; import com.codahale.metrics.Meter; +import com.google.common.base.Supplier; import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPool; import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPoolingContainer; import com.palantir.atlasdb.util.MetricsManager; diff --git a/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/AllValueTypesTestTable.java b/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/AllValueTypesTestTable.java index aa0f7dccddf..cddee9a65a0 100644 --- a/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/AllValueTypesTestTable.java +++ b/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/AllValueTypesTestTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -2107,5 +2107,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "r4GAOsoxikdmFU+sqUQzQA=="; + static String __CLASS_HASH = "7ICgYboWGmlASXKikUY+zQ=="; } diff --git a/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/ApiTestTableFactory.java b/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/ApiTestTableFactory.java index be6691994b1..d7c0dbd841f 100644 --- a/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/ApiTestTableFactory.java +++ b/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/ApiTestTableFactory.java @@ -24,14 +24,12 @@ private ApiTestTableFactory(List> this.namespace = namespace; } - public static ApiTestTableFactory of( - List> sharedTriggers, + public static ApiTestTableFactory of(List> sharedTriggers, Namespace namespace) { return new ApiTestTableFactory(sharedTriggers, namespace); } - public static ApiTestTableFactory of( - List> sharedTriggers) { + public static ApiTestTableFactory of(List> sharedTriggers) { return new ApiTestTableFactory(sharedTriggers, defaultNamespace); } @@ -67,20 +65,17 @@ public interface SharedTriggers extends AllValueTypesTestTable.AllValueTypesTest public abstract static class NullSharedTriggers implements SharedTriggers { @Override - public void putAllValueTypesTest( - Multimap> newRows) { + public void putAllValueTypesTest(Multimap> newRows) { // do nothing } @Override - public void putHashComponentsTest( - Multimap> newRows) { + public void putHashComponentsTest(Multimap> newRows) { // do nothing } @Override - public void putSchemaApiTest( - Multimap> newRows) { + public void putSchemaApiTest(Multimap> newRows) { // do nothing } } diff --git a/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/HashComponentsTestTable.java b/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/HashComponentsTestTable.java index 3b1f0f36f80..8e4673451bd 100644 --- a/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/HashComponentsTestTable.java +++ b/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/HashComponentsTestTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -749,5 +749,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "wcMKuy9F9wZNt8f7UQPeUg=="; + static String __CLASS_HASH = "D7jBjvqrJyVDhFQlvw9TRA=="; } diff --git a/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/SchemaApiTestTable.java b/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/SchemaApiTestTable.java index 4952a88ae23..77a2d1d1beb 100644 --- a/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/SchemaApiTestTable.java +++ b/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/SchemaApiTestTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -833,5 +833,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "h9whmxJpFX2yqVXafsa5AQ=="; + static String __CLASS_HASH = "gJjGs7nehodvK83lsXBdyA=="; } diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/TimestampCache.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/TimestampCache.java index cef406b7040..2f9f8235064 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/TimestampCache.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/TimestampCache.java @@ -15,8 +15,6 @@ */ package com.palantir.atlasdb.cache; -import java.util.function.Supplier; - import javax.annotation.Nullable; import com.codahale.metrics.MetricRegistry; @@ -24,6 +22,7 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.Policy; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Supplier; import com.palantir.atlasdb.util.AtlasDbMetrics; public class TimestampCache { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/CompactSchema.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/CompactSchema.java index 36f338b7b13..86859604913 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/CompactSchema.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/CompactSchema.java @@ -16,8 +16,8 @@ package com.palantir.atlasdb.schema; import java.io.File; -import java.util.function.Supplier; +import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.table.description.OptionalType; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/SweepSchema.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/SweepSchema.java index 4ef49789962..9cf98f6aa3e 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/SweepSchema.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/SweepSchema.java @@ -16,8 +16,8 @@ package com.palantir.atlasdb.schema; import java.io.File; -import java.util.function.Supplier; +import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.table.description.OptionalType; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/CompactMetadataTable.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/CompactMetadataTable.java index 75591ec4fbc..84843127ded 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/CompactMetadataTable.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/CompactMetadataTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -657,5 +657,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "vX96N598CtO5B/gkmgCmsg=="; + static String __CLASS_HASH = "0WtSpbMMOvlM3AribPiPxQ=="; } diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/CompactTableFactory.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/CompactTableFactory.java index 33378b4c986..b4f72639ff6 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/CompactTableFactory.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/CompactTableFactory.java @@ -24,14 +24,12 @@ private CompactTableFactory(List> this.namespace = namespace; } - public static CompactTableFactory of( - List> sharedTriggers, + public static CompactTableFactory of(List> sharedTriggers, Namespace namespace) { return new CompactTableFactory(sharedTriggers, namespace); } - public static CompactTableFactory of( - List> sharedTriggers) { + public static CompactTableFactory of(List> sharedTriggers) { return new CompactTableFactory(sharedTriggers, defaultNamespace); } @@ -53,8 +51,7 @@ public interface SharedTriggers extends CompactMetadataTable.CompactMetadataTrig public abstract static class NullSharedTriggers implements SharedTriggers { @Override - public void putCompactMetadata( - Multimap> newRows) { + public void putCompactMetadata(Multimap> newRows) { // do nothing } } diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepIdToNameTable.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepIdToNameTable.java index 5b089133e51..af2b463cd4b 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepIdToNameTable.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepIdToNameTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepNameToIdTable.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepNameToIdTable.java index a71e7ca53e1..ee7d20df00e 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepNameToIdTable.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepNameToIdTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepPriorityTable.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepPriorityTable.java index 7f503122edc..e51b9105bde 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepPriorityTable.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepPriorityTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -1214,5 +1214,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "P4pMrqwez6sbaQ8bCukCWA=="; + static String __CLASS_HASH = "SQZh8Tiuo9hisseHEHNpnA=="; } diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepShardProgressTable.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepShardProgressTable.java index 03cf9951d4a..03e7fe103f1 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepShardProgressTable.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepShardProgressTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepTableFactory.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepTableFactory.java index edced21d38b..a1411132fee 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepTableFactory.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepTableFactory.java @@ -24,14 +24,12 @@ private SweepTableFactory(List> sh this.namespace = namespace; } - public static SweepTableFactory of( - List> sharedTriggers, + public static SweepTableFactory of(List> sharedTriggers, Namespace namespace) { return new SweepTableFactory(sharedTriggers, namespace); } - public static SweepTableFactory of( - List> sharedTriggers) { + public static SweepTableFactory of(List> sharedTriggers) { return new SweepTableFactory(sharedTriggers, defaultNamespace); } @@ -53,8 +51,7 @@ public interface SharedTriggers extends SweepPriorityTable.SweepPriorityTrigger public abstract static class NullSharedTriggers implements SharedTriggers { @Override - public void putSweepPriority( - Multimap> newRows) { + public void putSweepPriority(Multimap> newRows) { // do nothing } } diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepableCellsTable.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepableCellsTable.java index 67e4a969aca..0178f5a6019 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepableCellsTable.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepableCellsTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepableTimestampsTable.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepableTimestampsTable.java index f013ae33b41..528c2860505 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepableTimestampsTable.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepableTimestampsTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/TableClearsTable.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/TableClearsTable.java index 6c8c3004d32..b8d4e27c47d 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/TableClearsTable.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/TableClearsTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/TargetedSweepTableFactory.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/TargetedSweepTableFactory.java index c7fcdb89f5a..58e585da9b4 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/TargetedSweepTableFactory.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/TargetedSweepTableFactory.java @@ -1,15 +1,14 @@ package com.palantir.atlasdb.schema.generated; -import java.util.List; - -import javax.annotation.Generated; - import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Multimap; import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.table.generation.Triggers; import com.palantir.atlasdb.transaction.api.Transaction; +import java.lang.Override; +import java.util.List; +import javax.annotation.Generated; @Generated("com.palantir.atlasdb.table.description.render.TableFactoryRenderer") public final class TargetedSweepTableFactory { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinition.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinition.java index 37d0957af5a..891b77624f9 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinition.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinition.java @@ -16,8 +16,8 @@ package com.palantir.atlasdb.schema.stream; import java.util.Map; -import java.util.function.Supplier; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import com.palantir.atlasdb.cleaner.api.OnCleanupTask; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnMetadataDescription.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnMetadataDescription.java index a8ce31a650b..b227f39d86e 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnMetadataDescription.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnMetadataDescription.java @@ -16,7 +16,9 @@ package com.palantir.atlasdb.table.description; import java.util.List; +import java.util.Map; import java.util.Set; +import java.util.SortedMap; import javax.annotation.concurrent.Immutable; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexMetadata.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexMetadata.java index bd2195b31db..436382009f3 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexMetadata.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexMetadata.java @@ -28,6 +28,7 @@ import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.CachePriority; import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy; import com.palantir.atlasdb.table.description.IndexDefinition.IndexType; +import com.palantir.atlasdb.table.description.render.Renderers; import com.palantir.atlasdb.transaction.api.ConflictHandler; public class IndexMetadata { diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schema.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schema.java index a0af42f8d0c..73f665464df 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schema.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schema.java @@ -26,7 +26,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import java.util.function.Supplier; import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; @@ -36,6 +35,7 @@ import com.google.common.base.Function; import com.google.common.base.Preconditions; +import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableRenderer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableRenderer.java index 1ca7ab40b04..eeb5d216776 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableRenderer.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableRenderer.java @@ -32,7 +32,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -42,6 +41,7 @@ import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractConditionAwareTransactionManager.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractConditionAwareTransactionManager.java index 981011ad894..0a549cdc1f3 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractConditionAwareTransactionManager.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractConditionAwareTransactionManager.java @@ -15,8 +15,7 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.function.Supplier; - +import com.google.common.base.Supplier; import com.palantir.atlasdb.cache.TimestampCache; import com.palantir.atlasdb.transaction.api.ConditionAwareTransactionTask; import com.palantir.atlasdb.transaction.api.PreCommitCondition; diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/RecomputingSupplier.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/RecomputingSupplier.java index 6bedcfd9824..3ee9f327ed7 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/RecomputingSupplier.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/RecomputingSupplier.java @@ -17,7 +17,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Supplier; + +import com.google.common.base.Supplier; public class RecomputingSupplier implements Supplier { final Supplier supplier; diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaTest.java index 8f7f034fe69..b36ad1e5875 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaTest.java @@ -49,8 +49,10 @@ public class SchemaTest { private static final String TEST_PACKAGE = "package"; private static final String TEST_TABLE_NAME = "TestTable"; + private static final String TEST_INDEX_NAME = TEST_TABLE_NAME + IndexDefinition.IndexType.ADDITIVE.getIndexSuffix(); private static final String TEST_PATH = TEST_PACKAGE + "/" + TEST_TABLE_NAME + "Table.java"; private static final TableReference TABLE_REF = TableReference.createWithEmptyNamespace(TEST_TABLE_NAME); + private static final TableReference INDEX_TABLE_REF = TableReference.createWithEmptyNamespace(TEST_INDEX_NAME); private static final String EXPECTED_FILES_FOLDER_PATH = "src/integrationInput/java"; @Test diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/generated/GenericRangeScanTestTable.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/generated/GenericRangeScanTestTable.java index 82a115653e0..c0bb708805c 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/generated/GenericRangeScanTestTable.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/generated/GenericRangeScanTestTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -766,5 +766,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "MhNj3HxZmOZNNoqQgJXPtA=="; + static String __CLASS_HASH = "nLl28oDHfbNzyKxXdgdZ7Q=="; } diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/generated/GenericTestSchemaTableFactory.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/generated/GenericTestSchemaTableFactory.java index 20f571ec537..b24ed77fe5d 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/generated/GenericTestSchemaTableFactory.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/generated/GenericTestSchemaTableFactory.java @@ -18,21 +18,18 @@ public final class GenericTestSchemaTableFactory { private final Namespace namespace; - private GenericTestSchemaTableFactory( - List> sharedTriggers, + private GenericTestSchemaTableFactory(List> sharedTriggers, Namespace namespace) { this.sharedTriggers = sharedTriggers; this.namespace = namespace; } - public static GenericTestSchemaTableFactory of( - List> sharedTriggers, + public static GenericTestSchemaTableFactory of(List> sharedTriggers, Namespace namespace) { return new GenericTestSchemaTableFactory(sharedTriggers, namespace); } - public static GenericTestSchemaTableFactory of( - List> sharedTriggers) { + public static GenericTestSchemaTableFactory of(List> sharedTriggers) { return new GenericTestSchemaTableFactory(sharedTriggers, defaultNamespace); } @@ -59,14 +56,12 @@ public interface SharedTriggers extends GenericRangeScanTestTable.GenericRangeSc public abstract static class NullSharedTriggers implements SharedTriggers { @Override - public void putGenericRangeScanTest( - Multimap newRows) { + public void putGenericRangeScanTest(Multimap newRows) { // do nothing } @Override - public void putRangeScanTest( - Multimap> newRows) { + public void putRangeScanTest(Multimap> newRows) { // do nothing } } diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/generated/RangeScanTestTable.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/generated/RangeScanTestTable.java index 2f505e56a27..814c3c38a92 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/generated/RangeScanTestTable.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/generated/RangeScanTestTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -706,5 +706,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "a190vUgJKD3lViaxZJkgww=="; + static String __CLASS_HASH = "L/EHvF7Ho3czZ/Z7Oae6xg=="; } diff --git a/atlasdb-commons/src/main/java/com/palantir/async/initializer/Callback.java b/atlasdb-commons/src/main/java/com/palantir/async/initializer/Callback.java index 48c7b0fa567..2f508d875e0 100644 --- a/atlasdb-commons/src/main/java/com/palantir/async/initializer/Callback.java +++ b/atlasdb-commons/src/main/java/com/palantir/async/initializer/Callback.java @@ -16,6 +16,8 @@ package com.palantir.async.initializer; import java.util.List; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; import com.google.common.collect.ImmutableList; import com.palantir.common.base.Throwables; diff --git a/atlasdb-commons/src/main/java/com/palantir/common/proxy/DelayProxy.java b/atlasdb-commons/src/main/java/com/palantir/common/proxy/DelayProxy.java index 6f109e9a0b0..c69a4d419ba 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/proxy/DelayProxy.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/proxy/DelayProxy.java @@ -18,8 +18,8 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import java.util.function.Supplier; +import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.palantir.common.base.Throwables; diff --git a/atlasdb-commons/src/main/java/com/palantir/common/proxy/MultiDelegateProxy.java b/atlasdb-commons/src/main/java/com/palantir/common/proxy/MultiDelegateProxy.java index b010763f299..00a08f824f7 100644 --- a/atlasdb-commons/src/main/java/com/palantir/common/proxy/MultiDelegateProxy.java +++ b/atlasdb-commons/src/main/java/com/palantir/common/proxy/MultiDelegateProxy.java @@ -19,12 +19,12 @@ import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.Arrays; -import java.util.function.Supplier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; +import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; import com.google.common.reflect.AbstractInvocationHandler; diff --git a/atlasdb-commons/src/test/java/com/palantir/common/concurrent/CoalescingSupplierTest.java b/atlasdb-commons/src/test/java/com/palantir/common/concurrent/CoalescingSupplierTest.java index df80fa0f831..68f215558a9 100644 --- a/atlasdb-commons/src/test/java/com/palantir/common/concurrent/CoalescingSupplierTest.java +++ b/atlasdb-commons/src/test/java/com/palantir/common/concurrent/CoalescingSupplierTest.java @@ -40,6 +40,7 @@ import org.junit.Test; import com.google.common.util.concurrent.Uninterruptibles; +import com.palantir.common.concurrent.CoalescingSupplier; public class CoalescingSupplierTest { private static final int DEFAULT_VALUE = 123; diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java index d0daabe0c3d..fe9dcf62272 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java @@ -26,13 +26,13 @@ import java.util.ServiceLoader; import java.util.function.LongSupplier; import java.util.function.Predicate; -import java.util.function.Supplier; import java.util.stream.StreamSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.palantir.atlasdb.config.LeaderConfig; import com.palantir.atlasdb.keyvalue.api.KeyValueService; @@ -60,7 +60,7 @@ public class ServiceDiscoveringAtlasSupplier { public ServiceDiscoveringAtlasSupplier( MetricsManager metricsManager, KeyValueServiceConfig config, - Supplier> runtimeConfig, + java.util.function.Supplier> runtimeConfig, Optional leaderConfig, Optional namespace, Optional timestampTable, diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java index 9ef3e527a76..88d89f8ada1 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java @@ -382,7 +382,7 @@ private TransactionManager serializableInternal(@Output List clos targetedSweep.singleAttemptCallback(), asyncInitializationCallback()); - Supplier transactionConfigSupplier = new MemoizedComposedSupplier<>( + com.google.common.base.Supplier transactionConfigSupplier = new MemoizedComposedSupplier<>( () -> runtimeConfigSupplier.get().transaction(), this::withConsolidatedGrabImmutableTsLockFlag); @@ -1041,7 +1041,7 @@ private static MultiTableSweepQueueWriter uninitializedTargetedSweeper( ImmutableList.of(follower)); } - private static class MemoizedComposedSupplier implements Supplier { + private static class MemoizedComposedSupplier implements com.google.common.base.Supplier { private final Function function; private final Supplier supplier; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleDdlConfig.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleDdlConfig.java index 16a63ca2c92..64b9115a46b 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleDdlConfig.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleDdlConfig.java @@ -17,7 +17,6 @@ import java.time.Duration; import java.util.Optional; -import java.util.function.Supplier; import org.immutables.value.Value; @@ -26,6 +25,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.google.common.base.Preconditions; +import com.google.common.base.Supplier; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.dbkvs.impl.OverflowMigrationState; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionManagerAwareDbKvs.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionManagerAwareDbKvs.java index ba9904574ce..257aeebfa6a 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionManagerAwareDbKvs.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionManagerAwareDbKvs.java @@ -16,8 +16,8 @@ package com.palantir.atlasdb.keyvalue.dbkvs.impl; import java.sql.Connection; -import java.util.function.Supplier; +import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.dbkvs.DbKeyValueServiceConfig; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionSupplier.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionSupplier.java index 6c5005b82fe..4ac9d28cc8e 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionSupplier.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionSupplier.java @@ -16,11 +16,11 @@ package com.palantir.atlasdb.keyvalue.dbkvs.impl; import java.sql.SQLException; -import java.util.function.Supplier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Supplier; import com.palantir.nexus.db.sql.SqlConnection; public class ConnectionSupplier implements SqlConnectionSupplier { diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbReadTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbReadTable.java index 9e0dc6961ac..8df15ef7d98 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbReadTable.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbReadTable.java @@ -21,8 +21,8 @@ import java.util.Map; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; +import com.google.common.base.Supplier; import com.google.common.collect.Iterables; import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection; import com.palantir.atlasdb.keyvalue.api.Cell; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SqlConnectionSupplier.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SqlConnectionSupplier.java index f31f9b4fbd6..8e9b990ab29 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SqlConnectionSupplier.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SqlConnectionSupplier.java @@ -16,8 +16,8 @@ package com.palantir.atlasdb.keyvalue.dbkvs.impl; import java.io.Closeable; -import java.util.function.Supplier; +import com.google.common.base.Supplier; import com.palantir.exception.PalantirSqlException; import com.palantir.nexus.db.sql.SqlConnection; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OverflowSequenceSupplier.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OverflowSequenceSupplier.java index c0ebbf9c314..d1a999b127c 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OverflowSequenceSupplier.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OverflowSequenceSupplier.java @@ -15,8 +15,7 @@ */ package com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle; -import java.util.function.Supplier; - +import com.google.common.base.Supplier; import com.palantir.atlasdb.AtlasDbConstants; import com.palantir.atlasdb.keyvalue.dbkvs.impl.ConnectionSupplier; diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRanges.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRanges.java index e8bf3b286bd..6fd03ecc693 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRanges.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRanges.java @@ -21,13 +21,13 @@ import java.util.NavigableMap; import java.util.SortedMap; import java.util.SortedSet; -import java.util.function.Supplier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import com.google.common.base.Predicates; +import com.google.common.base.Supplier; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/LatestSnapshotTable.java b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/LatestSnapshotTable.java index 87e7c2940c7..8055a82f1d1 100644 --- a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/LatestSnapshotTable.java +++ b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/LatestSnapshotTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -657,5 +657,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "G425LkwW0GRVAmmRAB+j7w=="; + static String __CLASS_HASH = "W1wwimLI6PCSvWYMupoGKg=="; } diff --git a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/NamespacedTodoTable.java b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/NamespacedTodoTable.java index 2075ba4a173..5932b73df0c 100644 --- a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/NamespacedTodoTable.java +++ b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/NamespacedTodoTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -713,5 +713,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "e/3fKcHrTJALXUFmSPfhiQ=="; + static String __CLASS_HASH = "OUopFBahCh4GfAJWIg453g=="; } diff --git a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamHashAidxTable.java b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamHashAidxTable.java index a38ddcac0a5..ada3a40b581 100644 --- a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamHashAidxTable.java +++ b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamHashAidxTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -713,5 +713,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "IwRcER9r6kzFtVSwR6OPBQ=="; + static String __CLASS_HASH = "oS3B0uQRP5UTheSmeHU/1Q=="; } diff --git a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamIdxTable.java b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamIdxTable.java index d5fe2f49da8..657b3b6a845 100644 --- a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamIdxTable.java +++ b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamIdxTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -713,5 +713,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "1UqSkFOUzEqmTURRRYou1A=="; + static String __CLASS_HASH = "trH+p2NDZdfn9AnxphcvkA=="; } diff --git a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamMetadataTable.java b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamMetadataTable.java index 6e4bcbf6595..9acf7bc15c9 100644 --- a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamMetadataTable.java +++ b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamMetadataTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -681,5 +681,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "IFrSLv7Usr5bzgm/WPZoCA=="; + static String __CLASS_HASH = "1zvuS46tqORldVBQiL1/uw=="; } diff --git a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamStore.java b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamStore.java index 8dffea7a7b7..9272c053473 100644 --- a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamStore.java +++ b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamStore.java @@ -47,6 +47,7 @@ import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.protos.generated.StreamPersistence.Status; import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata; +import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata.Builder; import com.palantir.atlasdb.stream.AbstractPersistentStreamStore; import com.palantir.atlasdb.stream.BlockConsumingInputStream; import com.palantir.atlasdb.stream.BlockGetter; @@ -131,7 +132,7 @@ private void touchMetadataWhileStoringForConflicts(Transaction t, Long id, long SnapshotsStreamMetadataTable.SnapshotsStreamMetadataRow row = SnapshotsStreamMetadataTable.SnapshotsStreamMetadataRow.of(id); StreamMetadata metadata = metaTable.getMetadatas(ImmutableSet.of(row)).values().iterator().next(); Preconditions.checkState(metadata.getStatus() == Status.STORING, "This stream is being cleaned up while storing blocks: %s", id); - StreamMetadata.Builder builder = StreamMetadata.newBuilder(metadata); + Builder builder = StreamMetadata.newBuilder(metadata); builder.setLength(blockNumber * BLOCK_SIZE_IN_BYTES + 1); metaTable.putMetadata(row, builder.build()); } @@ -387,6 +388,7 @@ protected void touchMetadataWhileMarkingUsedForConflicts(Transaction t, Iterable * {@link BlockGetter} * {@link BlockLoader} * {@link BufferedInputStream} + * {@link Builder} * {@link ByteArrayIOStream} * {@link ByteArrayInputStream} * {@link ByteStreams} diff --git a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamValueTable.java b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamValueTable.java index a74c4bd00ad..e247646a771 100644 --- a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamValueTable.java +++ b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/SnapshotsStreamValueTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -669,5 +669,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "LtSr8KW84jJ1kASsEGryAA=="; + static String __CLASS_HASH = "w2Kv2zKptBlrmL07xKxTRg=="; } diff --git a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/TodoSchemaTableFactory.java b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/TodoSchemaTableFactory.java index b2428e4347d..754463d80a1 100644 --- a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/TodoSchemaTableFactory.java +++ b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/TodoSchemaTableFactory.java @@ -18,21 +18,18 @@ public final class TodoSchemaTableFactory { private final Namespace namespace; - private TodoSchemaTableFactory( - List> sharedTriggers, + private TodoSchemaTableFactory(List> sharedTriggers, Namespace namespace) { this.sharedTriggers = sharedTriggers; this.namespace = namespace; } - public static TodoSchemaTableFactory of( - List> sharedTriggers, + public static TodoSchemaTableFactory of(List> sharedTriggers, Namespace namespace) { return new TodoSchemaTableFactory(sharedTriggers, namespace); } - public static TodoSchemaTableFactory of( - List> sharedTriggers) { + public static TodoSchemaTableFactory of(List> sharedTriggers) { return new TodoSchemaTableFactory(sharedTriggers, defaultNamespace); } @@ -83,44 +80,37 @@ public interface SharedTriggers extends LatestSnapshotTable.LatestSnapshotTrigge public abstract static class NullSharedTriggers implements SharedTriggers { @Override - public void putLatestSnapshot( - Multimap> newRows) { + public void putLatestSnapshot(Multimap> newRows) { // do nothing } @Override - public void putNamespacedTodo( - Multimap newRows) { + public void putNamespacedTodo(Multimap newRows) { // do nothing } @Override - public void putSnapshotsStreamHashAidx( - Multimap newRows) { + public void putSnapshotsStreamHashAidx(Multimap newRows) { // do nothing } @Override - public void putSnapshotsStreamIdx( - Multimap newRows) { + public void putSnapshotsStreamIdx(Multimap newRows) { // do nothing } @Override - public void putSnapshotsStreamMetadata( - Multimap> newRows) { + public void putSnapshotsStreamMetadata(Multimap> newRows) { // do nothing } @Override - public void putSnapshotsStreamValue( - Multimap> newRows) { + public void putSnapshotsStreamValue(Multimap> newRows) { // do nothing } @Override - public void putTodo( - Multimap> newRows) { + public void putTodo(Multimap> newRows) { // do nothing } } diff --git a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/TodoTable.java b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/TodoTable.java index 2380e03d917..0050082f335 100644 --- a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/TodoTable.java +++ b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/generated/TodoTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -657,5 +657,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "W4nZk/S4/IXkgnEvSLR5ZA=="; + static String __CLASS_HASH = "WZNsYRJNFU3f5r1AQ65yrw=="; } diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/AuditedDataTable.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/AuditedDataTable.java index c5c939f3976..2624bc99b08 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/AuditedDataTable.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/AuditedDataTable.java @@ -15,7 +15,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; import com.google.common.base.Optional; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -657,5 +657,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "6Nc5O+7Y+IxfjkHR4bjHiw=="; + static String __CLASS_HASH = "q9Ur/tVv9Zy8v6wnnmNG6A=="; } diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/BlobSchemaTableFactory.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/BlobSchemaTableFactory.java index 413c8a3f8ee..9fbe3452a2c 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/BlobSchemaTableFactory.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/BlobSchemaTableFactory.java @@ -18,21 +18,18 @@ public final class BlobSchemaTableFactory { private final Namespace namespace; - private BlobSchemaTableFactory( - List> sharedTriggers, + private BlobSchemaTableFactory(List> sharedTriggers, Namespace namespace) { this.sharedTriggers = sharedTriggers; this.namespace = namespace; } - public static BlobSchemaTableFactory of( - List> sharedTriggers, + public static BlobSchemaTableFactory of(List> sharedTriggers, Namespace namespace) { return new BlobSchemaTableFactory(sharedTriggers, namespace); } - public static BlobSchemaTableFactory of( - List> sharedTriggers) { + public static BlobSchemaTableFactory of(List> sharedTriggers) { return new BlobSchemaTableFactory(sharedTriggers, defaultNamespace); } @@ -94,56 +91,47 @@ public interface SharedTriggers extends AuditedDataTable.AuditedDataTrigger, Dat public abstract static class NullSharedTriggers implements SharedTriggers { @Override - public void putAuditedData( - Multimap> newRows) { + public void putAuditedData(Multimap> newRows) { // do nothing } @Override - public void putDataStreamHashAidx( - Multimap newRows) { + public void putDataStreamHashAidx(Multimap newRows) { // do nothing } @Override - public void putDataStreamIdx( - Multimap newRows) { + public void putDataStreamIdx(Multimap newRows) { // do nothing } @Override - public void putDataStreamMetadata( - Multimap> newRows) { + public void putDataStreamMetadata(Multimap> newRows) { // do nothing } @Override - public void putDataStreamValue( - Multimap> newRows) { + public void putDataStreamValue(Multimap> newRows) { // do nothing } @Override - public void putHotspottyDataStreamHashAidx( - Multimap newRows) { + public void putHotspottyDataStreamHashAidx(Multimap newRows) { // do nothing } @Override - public void putHotspottyDataStreamIdx( - Multimap newRows) { + public void putHotspottyDataStreamIdx(Multimap newRows) { // do nothing } @Override - public void putHotspottyDataStreamMetadata( - Multimap> newRows) { + public void putHotspottyDataStreamMetadata(Multimap> newRows) { // do nothing } @Override - public void putHotspottyDataStreamValue( - Multimap> newRows) { + public void putHotspottyDataStreamValue(Multimap> newRows) { // do nothing } } diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamHashAidxTable.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamHashAidxTable.java index 94ca6326943..28883ce656f 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamHashAidxTable.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamHashAidxTable.java @@ -15,7 +15,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; import com.google.common.base.Optional; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -713,5 +713,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "lvvjngrfkSQr/c1LTQJLEQ=="; + static String __CLASS_HASH = "DgL76OhsjjfzDcgwbtKo5A=="; } diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamIdxTable.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamIdxTable.java index 07c18504c71..cb3f59277fb 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamIdxTable.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamIdxTable.java @@ -15,7 +15,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; import com.google.common.base.Optional; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -727,5 +727,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "qvfFqIXEUvtHLzK6komRzQ=="; + static String __CLASS_HASH = "akfc3RwqwCN9ne8saSTh2A=="; } diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamMetadataTable.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamMetadataTable.java index 66a3555b744..08e542bf3d0 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamMetadataTable.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamMetadataTable.java @@ -15,7 +15,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; import com.google.common.base.Optional; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -695,5 +695,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "QSzAZuyzoZhM3sBPyaiD8w=="; + static String __CLASS_HASH = "R8htd1SMhNPTnF3yuJ+Htg=="; } diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamStore.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamStore.java index 2d029621387..35f04d1351a 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamStore.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamStore.java @@ -47,6 +47,7 @@ import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.protos.generated.StreamPersistence.Status; import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata; +import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata.Builder; import com.palantir.atlasdb.stream.AbstractPersistentStreamStore; import com.palantir.atlasdb.stream.BlockConsumingInputStream; import com.palantir.atlasdb.stream.BlockGetter; @@ -131,7 +132,7 @@ private void touchMetadataWhileStoringForConflicts(Transaction t, Long id, long DataStreamMetadataTable.DataStreamMetadataRow row = DataStreamMetadataTable.DataStreamMetadataRow.of(id); StreamMetadata metadata = metaTable.getMetadatas(ImmutableSet.of(row)).values().iterator().next(); Preconditions.checkState(metadata.getStatus() == Status.STORING, "This stream is being cleaned up while storing blocks: %s", id); - StreamMetadata.Builder builder = StreamMetadata.newBuilder(metadata); + Builder builder = StreamMetadata.newBuilder(metadata); builder.setLength(blockNumber * BLOCK_SIZE_IN_BYTES + 1); metaTable.putMetadata(row, builder.build()); } @@ -387,6 +388,7 @@ protected void touchMetadataWhileMarkingUsedForConflicts(Transaction t, Iterable * {@link BlockGetter} * {@link BlockLoader} * {@link BufferedInputStream} + * {@link Builder} * {@link ByteArrayIOStream} * {@link ByteArrayInputStream} * {@link ByteStreams} diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamValueTable.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamValueTable.java index e04a6c311ae..7b1d5ada2bf 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamValueTable.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/DataStreamValueTable.java @@ -15,7 +15,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; import com.google.common.base.Optional; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -684,5 +684,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "JtRTFoI5vtIMnD3283JE2g=="; + static String __CLASS_HASH = "mDGfypIqrVWc1GEkvuAc2g=="; } diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamHashAidxTable.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamHashAidxTable.java index 97c3d213f06..250a0453304 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamHashAidxTable.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamHashAidxTable.java @@ -15,7 +15,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; import com.google.common.base.Optional; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -713,5 +713,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "VEJqEMPrTc0lfiqrnikLbQ=="; + static String __CLASS_HASH = "Lh4UEEm2Yer4BJTWKfCP4Q=="; } diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamIdxTable.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamIdxTable.java index 53aa55a43a3..fe02d8becd7 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamIdxTable.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamIdxTable.java @@ -15,7 +15,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; import com.google.common.base.Optional; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -713,5 +713,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "Sc8oMFQvsi2pRHYjQPYZ3g=="; + static String __CLASS_HASH = "G2byjrwUZEphtaXrSUazqA=="; } diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamMetadataTable.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamMetadataTable.java index d2df34afd88..e46a73fa1ed 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamMetadataTable.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamMetadataTable.java @@ -15,7 +15,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; import com.google.common.base.Optional; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -681,5 +681,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "QaDIw4TvnUyZVmKnezbWCg=="; + static String __CLASS_HASH = "oe90c1XfQ57B56r5/IE91g=="; } diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamStore.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamStore.java index e758956c158..c19053ac4c4 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamStore.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamStore.java @@ -47,6 +47,7 @@ import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.protos.generated.StreamPersistence.Status; import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata; +import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata.Builder; import com.palantir.atlasdb.stream.AbstractPersistentStreamStore; import com.palantir.atlasdb.stream.BlockConsumingInputStream; import com.palantir.atlasdb.stream.BlockGetter; @@ -131,7 +132,7 @@ private void touchMetadataWhileStoringForConflicts(Transaction t, Long id, long HotspottyDataStreamMetadataTable.HotspottyDataStreamMetadataRow row = HotspottyDataStreamMetadataTable.HotspottyDataStreamMetadataRow.of(id); StreamMetadata metadata = metaTable.getMetadatas(ImmutableSet.of(row)).values().iterator().next(); Preconditions.checkState(metadata.getStatus() == Status.STORING, "This stream is being cleaned up while storing blocks: %s", id); - StreamMetadata.Builder builder = StreamMetadata.newBuilder(metadata); + Builder builder = StreamMetadata.newBuilder(metadata); builder.setLength(blockNumber * BLOCK_SIZE_IN_BYTES + 1); metaTable.putMetadata(row, builder.build()); } @@ -387,6 +388,7 @@ protected void touchMetadataWhileMarkingUsedForConflicts(Transaction t, Iterable * {@link BlockGetter} * {@link BlockLoader} * {@link BufferedInputStream} + * {@link Builder} * {@link ByteArrayIOStream} * {@link ByteArrayInputStream} * {@link ByteStreams} diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamValueTable.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamValueTable.java index 2c3fe317b80..8e437a721f7 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamValueTable.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/generated/HotspottyDataStreamValueTable.java @@ -15,7 +15,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; import com.google.common.base.Optional; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -669,5 +669,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "6vh3X5Z+N1hyCKtBTfePog=="; + static String __CLASS_HASH = "SbxZ2fy8SdPXh+5D339tnQ=="; } diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/generated/CheckAndSetSchemaTableFactory.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/generated/CheckAndSetSchemaTableFactory.java index 7110bf1d65b..667178b6623 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/generated/CheckAndSetSchemaTableFactory.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/generated/CheckAndSetSchemaTableFactory.java @@ -18,21 +18,18 @@ public final class CheckAndSetSchemaTableFactory { private final Namespace namespace; - private CheckAndSetSchemaTableFactory( - List> sharedTriggers, + private CheckAndSetSchemaTableFactory(List> sharedTriggers, Namespace namespace) { this.sharedTriggers = sharedTriggers; this.namespace = namespace; } - public static CheckAndSetSchemaTableFactory of( - List> sharedTriggers, + public static CheckAndSetSchemaTableFactory of(List> sharedTriggers, Namespace namespace) { return new CheckAndSetSchemaTableFactory(sharedTriggers, namespace); } - public static CheckAndSetSchemaTableFactory of( - List> sharedTriggers) { + public static CheckAndSetSchemaTableFactory of(List> sharedTriggers) { return new CheckAndSetSchemaTableFactory(sharedTriggers, defaultNamespace); } @@ -54,8 +51,7 @@ public interface SharedTriggers extends CheckAndSetTable.CheckAndSetTrigger { public abstract static class NullSharedTriggers implements SharedTriggers { @Override - public void putCheckAndSet( - Multimap> newRows) { + public void putCheckAndSet(Multimap> newRows) { // do nothing } } diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/generated/CheckAndSetTable.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/generated/CheckAndSetTable.java index 16cb5d032ba..3b7e9d17ae3 100644 --- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/generated/CheckAndSetTable.java +++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/generated/CheckAndSetTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -657,5 +657,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "9i0+VTCYXJvu7IWoduZI+w=="; + static String __CLASS_HASH = "QWc6X5pvzfCCbu6ttAaF3A=="; } diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/AsyncPuncher.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/AsyncPuncher.java index 485606d5aa8..8619871ceae 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/AsyncPuncher.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/AsyncPuncher.java @@ -18,11 +18,11 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Supplier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Supplier; import com.palantir.common.concurrent.NamedThreadFactory; import com.palantir.common.concurrent.PTExecutors; import com.palantir.logsafe.SafeArg; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/DefaultCleanerBuilder.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/DefaultCleanerBuilder.java index e0c281ae1cd..05993cf480f 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/DefaultCleanerBuilder.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/DefaultCleanerBuilder.java @@ -16,8 +16,8 @@ package com.palantir.atlasdb.cleaner; import java.util.List; -import java.util.function.Supplier; +import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.AtlasDbConstants; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ImmutableTimestampSupplier.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ImmutableTimestampSupplier.java index 7c4f2550458..4023854b96f 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ImmutableTimestampSupplier.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ImmutableTimestampSupplier.java @@ -16,8 +16,8 @@ package com.palantir.atlasdb.cleaner; import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; +import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.palantir.lock.v2.TimelockService; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Puncher.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Puncher.java index 279bda22d39..16bf4f116af 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Puncher.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Puncher.java @@ -15,7 +15,7 @@ */ package com.palantir.atlasdb.cleaner; -import java.util.function.Supplier; +import com.google.common.base.Supplier; public interface Puncher { diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Scrubber.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Scrubber.java index 0d46a4b13f6..bdfd117d087 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Scrubber.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Scrubber.java @@ -29,7 +29,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Supplier; import javax.annotation.concurrent.GuardedBy; @@ -37,6 +36,7 @@ import org.slf4j.LoggerFactory; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableMultimap; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimpleCleaner.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimpleCleaner.java index d3d920f1b4b..9513e0870ab 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimpleCleaner.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimpleCleaner.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.cleaner; -import java.util.function.Supplier; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Supplier; import com.google.common.collect.Multimap; import com.palantir.atlasdb.cleaner.api.Cleaner; import com.palantir.atlasdb.keyvalue.api.Cell; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimplePuncher.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimplePuncher.java index 782b6dcd133..32e8fd6462d 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimplePuncher.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimplePuncher.java @@ -15,8 +15,7 @@ */ package com.palantir.atlasdb.cleaner; -import java.util.function.Supplier; - +import com.google.common.base.Supplier; import com.palantir.common.time.Clock; /** diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSource.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSource.java index 4eecb5c8879..74d7a4c47ce 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSource.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSource.java @@ -16,12 +16,12 @@ package com.palantir.atlasdb.sweep; import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Supplier; import org.apache.commons.lang3.math.NumberUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Supplier; import com.palantir.atlasdb.util.MetricsManager; import com.palantir.logsafe.SafeArg; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeperImpl.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeperImpl.java index 78ef4594f8c..3b5f3dc8ddc 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeperImpl.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeperImpl.java @@ -17,12 +17,12 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; -import java.util.function.Supplier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; +import com.google.common.base.Supplier; import com.google.common.collect.Sets; import com.palantir.atlasdb.sweep.metrics.SweepOutcome; import com.palantir.atlasdb.sweep.metrics.SweepOutcomeMetrics; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractLockAwareTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractLockAwareTransactionManager.java index 9cdc26c8aed..6da7b71b721 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractLockAwareTransactionManager.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractLockAwareTransactionManager.java @@ -15,8 +15,7 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.function.Supplier; - +import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.cache.TimestampCache; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AdvisoryLockConditionSuppliers.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AdvisoryLockConditionSuppliers.java index 92a0662d260..a8d9588315c 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AdvisoryLockConditionSuppliers.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AdvisoryLockConditionSuppliers.java @@ -16,13 +16,13 @@ package com.palantir.atlasdb.transaction.impl; import java.util.Set; -import java.util.function.Supplier; import org.apache.commons.lang3.Validate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Supplier; import com.google.common.collect.ImmutableSet; import com.palantir.atlasdb.transaction.api.LockAcquisitionException; import com.palantir.lock.HeldLocksToken; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ReadOnlyTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ReadOnlyTransactionManager.java index eed0c243cdf..3b0273147d7 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ReadOnlyTransactionManager.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ReadOnlyTransactionManager.java @@ -15,8 +15,7 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.function.Supplier; - +import com.google.common.base.Supplier; import com.google.common.util.concurrent.MoreExecutors; import com.palantir.atlasdb.cache.TimestampCache; import com.palantir.atlasdb.cleaner.api.Cleaner; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransaction.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransaction.java index da62513113d..4a16b2ecda5 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransaction.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransaction.java @@ -29,7 +29,6 @@ import java.util.concurrent.ConcurrentNavigableMap; import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ExecutorService; -import java.util.function.Supplier; import javax.annotation.Nullable; @@ -40,6 +39,7 @@ import com.google.common.base.Functions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManager.java index 85a45140e56..8339ed476a8 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManager.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManager.java @@ -20,9 +20,9 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Supplier; import com.google.common.collect.ImmutableSet; import com.palantir.async.initializer.Callback; import com.palantir.atlasdb.cache.TimestampCache; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ShouldNotDeleteAndRollbackTransaction.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ShouldNotDeleteAndRollbackTransaction.java index c9e100e8f6b..bb79c58df2b 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ShouldNotDeleteAndRollbackTransaction.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ShouldNotDeleteAndRollbackTransaction.java @@ -20,8 +20,8 @@ import java.util.concurrent.AbstractExecutorService; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; +import com.google.common.base.Supplier; import com.palantir.atlasdb.cache.TimestampCache; import com.palantir.atlasdb.cleaner.NoOpCleaner; import com.palantir.atlasdb.keyvalue.api.KeyValueService; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransaction.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransaction.java index d8b0e0c0d43..8f546ebfbb1 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransaction.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransaction.java @@ -35,7 +35,6 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import java.util.stream.StreamSupport; @@ -55,6 +54,7 @@ import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import com.google.common.base.Supplier; import com.google.common.collect.AbstractIterator; import com.google.common.collect.Collections2; import com.google.common.collect.FluentIterable; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManager.java index 0ca11658a3f..d834335449b 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManager.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManager.java @@ -24,12 +24,12 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Supplier; import javax.validation.constraints.NotNull; import com.codahale.metrics.Timer; import com.google.common.base.Preconditions; +import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/WrappingTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/WrappingTransactionManager.java index 436cb3eb7a0..b51cd8ecd04 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/WrappingTransactionManager.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/WrappingTransactionManager.java @@ -15,8 +15,7 @@ */ package com.palantir.atlasdb.transaction.impl; -import java.util.function.Supplier; - +import com.google.common.base.Supplier; import com.palantir.atlasdb.transaction.api.AutoDelegate_TransactionManager; import com.palantir.atlasdb.transaction.api.ConditionAwareTransactionTask; import com.palantir.atlasdb.transaction.api.LockAwareTransactionTask; diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcome.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcome.java index 9920914a71e..845d9e696c9 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcome.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcome.java @@ -15,8 +15,7 @@ */ package com.palantir.atlasdb.transaction.impl.metrics; -import java.util.function.Supplier; - +import com.google.common.base.Supplier; import com.palantir.atlasdb.transaction.api.LockAwareTransactionTask; import com.palantir.atlasdb.transaction.api.TransactionManager; import com.palantir.atlasdb.transaction.service.TransactionService; diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/AdvisoryLocksConditionTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/AdvisoryLocksConditionTest.java index 2a960cf09e5..2aad1b5d733 100644 --- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/AdvisoryLocksConditionTest.java +++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/AdvisoryLocksConditionTest.java @@ -25,11 +25,11 @@ import java.math.BigInteger; import java.util.Collections; import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; import org.junit.Before; import org.junit.Test; +import com.google.common.base.Supplier; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; import com.palantir.atlasdb.transaction.api.LockAcquisitionException; diff --git a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcKeyValueSharedTest.java b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcKeyValueSharedTest.java index 95fb3aaf57e..74923fec07d 100644 --- a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcKeyValueSharedTest.java +++ b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcKeyValueSharedTest.java @@ -14,13 +14,14 @@ * limitations under the License. */ package com.palantir.atlasdb.jdbc; - import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.junit.ClassRule; import org.junit.Test; +import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.impl.AbstractKeyValueServiceTest; +import com.palantir.atlasdb.keyvalue.impl.KvsManager; import com.palantir.atlasdb.keyvalue.impl.TestResourceManager; public class JdbcKeyValueSharedTest extends AbstractKeyValueServiceTest { diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/KeyValueTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/KeyValueTable.java index 2034f9b7f52..9fa70d8a7bd 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/KeyValueTable.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/KeyValueTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; 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 ce66e983470..7786a189b8a 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 @@ -11,6 +11,7 @@ import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.protos.generated.StreamPersistence.Status; import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata; +import com.palantir.atlasdb.table.description.ValueType; import com.palantir.atlasdb.transaction.api.Transaction; public class ValueMetadataCleanupTask implements OnCleanupTask { diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueStreamHashAidxTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueStreamHashAidxTable.java index a6cd9b83d75..6c236f99a3c 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueStreamHashAidxTable.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueStreamHashAidxTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueStreamIdxTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueStreamIdxTable.java index f8586424116..7e651dc80dd 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueStreamIdxTable.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueStreamIdxTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueStreamMetadataTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueStreamMetadataTable.java index d508682195d..c9089c9499c 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueStreamMetadataTable.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueStreamMetadataTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueStreamValueTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueStreamValueTable.java index 1a811417d1d..71e64331d56 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueStreamValueTable.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/generated/ValueStreamValueTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTestUtils.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTestUtils.java index 570340f0e31..c90b2113bc8 100644 --- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTestUtils.java +++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTestUtils.java @@ -15,11 +15,10 @@ */ package com.palantir.atlasdb.sweep; -import java.util.function.Supplier; - import org.awaitility.Awaitility; import org.awaitility.Duration; +import com.google.common.base.Supplier; import com.palantir.atlasdb.cleaner.NoOpCleaner; import com.palantir.atlasdb.cleaner.api.Cleaner; import com.palantir.atlasdb.keyvalue.api.KeyValueService; diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/PuncherTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/PuncherTest.java index 23176baac2a..abbeafdbd49 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/PuncherTest.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/PuncherTest.java @@ -18,7 +18,6 @@ import static org.junit.Assert.assertEquals; import java.util.Collection; -import java.util.function.Supplier; import org.junit.After; import org.junit.Test; @@ -26,6 +25,7 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; import com.palantir.atlasdb.keyvalue.api.KeyValueService; diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableTasksTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableTasksTest.java index 3d5b77a76e5..93fdcdaa005 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableTasksTest.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableTasksTest.java @@ -19,13 +19,13 @@ import java.util.Map.Entry; import java.util.Random; import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Supplier; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableMap; diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/DataTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/DataTable.java index 6c8b248562b..b1440e20948 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/DataTable.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/DataTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -3456,5 +3456,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "Wmp9yvtNFIEf3vhhi/mYJg=="; + static String __CLASS_HASH = "xnOm0QZPMtAT9yZToV1YiQ=="; } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/IndexTestTableFactory.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/IndexTestTableFactory.java index bbb9dbdc049..db4fd366eb6 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/IndexTestTableFactory.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/IndexTestTableFactory.java @@ -18,21 +18,18 @@ public final class IndexTestTableFactory { private final Namespace namespace; - private IndexTestTableFactory( - List> sharedTriggers, + private IndexTestTableFactory(List> sharedTriggers, Namespace namespace) { this.sharedTriggers = sharedTriggers; this.namespace = namespace; } - public static IndexTestTableFactory of( - List> sharedTriggers, + public static IndexTestTableFactory of(List> sharedTriggers, Namespace namespace) { return new IndexTestTableFactory(sharedTriggers, namespace); } - public static IndexTestTableFactory of( - List> sharedTriggers) { + public static IndexTestTableFactory of(List> sharedTriggers) { return new IndexTestTableFactory(sharedTriggers, defaultNamespace); } @@ -58,14 +55,12 @@ public interface SharedTriggers extends DataTable.DataTrigger, TwoColumnsTable.T public abstract static class NullSharedTriggers implements SharedTriggers { @Override - public void putData( - Multimap> newRows) { + public void putData(Multimap> newRows) { // do nothing } @Override - public void putTwoColumns( - Multimap> newRows) { + public void putTwoColumns(Multimap> newRows) { // do nothing } } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/TwoColumnsTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/TwoColumnsTable.java index 51faf2a3ec6..ee689ec5380 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/TwoColumnsTable.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/TwoColumnsTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -2126,5 +2126,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "VuZV92tdhOJktDN2j4RtrA=="; + static String __CLASS_HASH = "JnmKvbbyrrxBYn7NjaLlMQ=="; } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/KeyValueTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/KeyValueTable.java index 04ec81e9f8d..c76041a9891 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/KeyValueTable.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/KeyValueTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -657,5 +657,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "QL+z9A2s2e1NZYOyuS/1Sw=="; + static String __CLASS_HASH = "yq2eXKtO//M5nxFkoep7Tw=="; } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamHashAidxTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamHashAidxTable.java index aedf1709173..bfbba2d6e61 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamHashAidxTable.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamHashAidxTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -713,5 +713,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "BGKnCVLUrxJxAL0D/CF9zQ=="; + static String __CLASS_HASH = "E8Zf6PtirrT7zsEz8//DWA=="; } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamIdxTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamIdxTable.java index 084186a9968..3d4e217c81b 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamIdxTable.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamIdxTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -713,5 +713,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "5Kw1x4oNRH59g34je0UBxg=="; + static String __CLASS_HASH = "KcJ0j6ecliQFnp5AXn9sPg=="; } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamMetadataTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamMetadataTable.java index a9d87160465..ff45793c0a3 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamMetadataTable.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamMetadataTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -681,5 +681,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "nWegvF01Lpl2jDfjGYwJCQ=="; + static String __CLASS_HASH = "LUALHqjCsPPOiV+ASF250g=="; } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamStore.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamStore.java index a2a9f698e50..6be57e866d8 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamStore.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamStore.java @@ -47,6 +47,7 @@ import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.protos.generated.StreamPersistence.Status; import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata; +import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata.Builder; import com.palantir.atlasdb.stream.AbstractPersistentStreamStore; import com.palantir.atlasdb.stream.BlockConsumingInputStream; import com.palantir.atlasdb.stream.BlockGetter; @@ -131,7 +132,7 @@ private void touchMetadataWhileStoringForConflicts(Transaction t, Long id, long StreamTestMaxMemStreamMetadataTable.StreamTestMaxMemStreamMetadataRow row = StreamTestMaxMemStreamMetadataTable.StreamTestMaxMemStreamMetadataRow.of(id); StreamMetadata metadata = metaTable.getMetadatas(ImmutableSet.of(row)).values().iterator().next(); Preconditions.checkState(metadata.getStatus() == Status.STORING, "This stream is being cleaned up while storing blocks: %s", id); - StreamMetadata.Builder builder = StreamMetadata.newBuilder(metadata); + Builder builder = StreamMetadata.newBuilder(metadata); builder.setLength(blockNumber * BLOCK_SIZE_IN_BYTES + 1); metaTable.putMetadata(row, builder.build()); } @@ -387,6 +388,7 @@ protected void touchMetadataWhileMarkingUsedForConflicts(Transaction t, Iterable * {@link BlockGetter} * {@link BlockLoader} * {@link BufferedInputStream} + * {@link Builder} * {@link ByteArrayIOStream} * {@link ByteArrayInputStream} * {@link ByteStreams} diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamValueTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamValueTable.java index b23250571c8..3b76894440d 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamValueTable.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMaxMemStreamValueTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -669,5 +669,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "4uXsWYBZ/v654Q8MmVT4qQ=="; + static String __CLASS_HASH = "xlZF1W8D8pUOTe2VGEmOMg=="; } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamHashAidxTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamHashAidxTable.java index f609effd390..035ce03d3db 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamHashAidxTable.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamHashAidxTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -713,5 +713,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "1izVl8c9CiqS56BSsLQGOw=="; + static String __CLASS_HASH = "9FT31wDEhFmVUaK07cQXhQ=="; } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamIdxTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamIdxTable.java index 79d5ca4df21..0c22e9790c0 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamIdxTable.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamIdxTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -713,5 +713,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "lvoXLu7X3qr+Dj2VApj7BA=="; + static String __CLASS_HASH = "lgn8+RrwnRD+ORztxbl9ww=="; } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamMetadataTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamMetadataTable.java index 61b894c2676..56d0712ce01 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamMetadataTable.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamMetadataTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -681,5 +681,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "g1cGlMObiaMACzqGog6FmA=="; + static String __CLASS_HASH = "qha2HckQObFa2UMd3U5jvg=="; } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamStore.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamStore.java index 54c277e3d88..875dd0d30ea 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamStore.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamStore.java @@ -47,6 +47,7 @@ import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.protos.generated.StreamPersistence.Status; import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata; +import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata.Builder; import com.palantir.atlasdb.stream.AbstractPersistentStreamStore; import com.palantir.atlasdb.stream.BlockConsumingInputStream; import com.palantir.atlasdb.stream.BlockGetter; @@ -131,7 +132,7 @@ private void touchMetadataWhileStoringForConflicts(Transaction t, Long id, long StreamTestStreamMetadataTable.StreamTestStreamMetadataRow row = StreamTestStreamMetadataTable.StreamTestStreamMetadataRow.of(id); StreamMetadata metadata = metaTable.getMetadatas(ImmutableSet.of(row)).values().iterator().next(); Preconditions.checkState(metadata.getStatus() == Status.STORING, "This stream is being cleaned up while storing blocks: %s", id); - StreamMetadata.Builder builder = StreamMetadata.newBuilder(metadata); + Builder builder = StreamMetadata.newBuilder(metadata); builder.setLength(blockNumber * BLOCK_SIZE_IN_BYTES + 1); metaTable.putMetadata(row, builder.build()); } @@ -387,6 +388,7 @@ protected void touchMetadataWhileMarkingUsedForConflicts(Transaction t, Iterable * {@link BlockGetter} * {@link BlockLoader} * {@link BufferedInputStream} + * {@link Builder} * {@link ByteArrayIOStream} * {@link ByteArrayInputStream} * {@link ByteStreams} diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamValueTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamValueTable.java index 169436698de..6669588e760 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamValueTable.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamValueTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -669,5 +669,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "l30alN6O9OyBeAKfWa2vtA=="; + static String __CLASS_HASH = "Ij5stLmnPhWfrTCFkq5FAA=="; } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestTableFactory.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestTableFactory.java index a11d462bab8..9fd5b36009a 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestTableFactory.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestTableFactory.java @@ -18,21 +18,18 @@ public final class StreamTestTableFactory { private final Namespace namespace; - private StreamTestTableFactory( - List> sharedTriggers, + private StreamTestTableFactory(List> sharedTriggers, Namespace namespace) { this.sharedTriggers = sharedTriggers; this.namespace = namespace; } - public static StreamTestTableFactory of( - List> sharedTriggers, + public static StreamTestTableFactory of(List> sharedTriggers, Namespace namespace) { return new StreamTestTableFactory(sharedTriggers, namespace); } - public static StreamTestTableFactory of( - List> sharedTriggers) { + public static StreamTestTableFactory of(List> sharedTriggers) { return new StreamTestTableFactory(sharedTriggers, defaultNamespace); } @@ -89,8 +86,7 @@ public StreamTestStreamValueTable getStreamTestStreamValueTable(Transaction t, return StreamTestStreamValueTable.of(t, namespace, Triggers.getAllTriggers(t, sharedTriggers, triggers)); } - public StreamTestWithHashStreamHashAidxTable getStreamTestWithHashStreamHashAidxTable( - Transaction t, + public StreamTestWithHashStreamHashAidxTable getStreamTestWithHashStreamHashAidxTable(Transaction t, StreamTestWithHashStreamHashAidxTable.StreamTestWithHashStreamHashAidxTrigger... triggers) { return StreamTestWithHashStreamHashAidxTable.of(t, namespace, Triggers.getAllTriggers(t, sharedTriggers, triggers)); } @@ -100,8 +96,7 @@ public StreamTestWithHashStreamIdxTable getStreamTestWithHashStreamIdxTable(Tran return StreamTestWithHashStreamIdxTable.of(t, namespace, Triggers.getAllTriggers(t, sharedTriggers, triggers)); } - public StreamTestWithHashStreamMetadataTable getStreamTestWithHashStreamMetadataTable( - Transaction t, + public StreamTestWithHashStreamMetadataTable getStreamTestWithHashStreamMetadataTable(Transaction t, StreamTestWithHashStreamMetadataTable.StreamTestWithHashStreamMetadataTrigger... triggers) { return StreamTestWithHashStreamMetadataTable.of(t, namespace, Triggers.getAllTriggers(t, sharedTriggers, triggers)); } @@ -111,8 +106,7 @@ public StreamTestWithHashStreamValueTable getStreamTestWithHashStreamValueTable( return StreamTestWithHashStreamValueTable.of(t, namespace, Triggers.getAllTriggers(t, sharedTriggers, triggers)); } - public TestHashComponentsStreamHashAidxTable getTestHashComponentsStreamHashAidxTable( - Transaction t, + public TestHashComponentsStreamHashAidxTable getTestHashComponentsStreamHashAidxTable(Transaction t, TestHashComponentsStreamHashAidxTable.TestHashComponentsStreamHashAidxTrigger... triggers) { return TestHashComponentsStreamHashAidxTable.of(t, namespace, Triggers.getAllTriggers(t, sharedTriggers, triggers)); } @@ -122,8 +116,7 @@ public TestHashComponentsStreamIdxTable getTestHashComponentsStreamIdxTable(Tran return TestHashComponentsStreamIdxTable.of(t, namespace, Triggers.getAllTriggers(t, sharedTriggers, triggers)); } - public TestHashComponentsStreamMetadataTable getTestHashComponentsStreamMetadataTable( - Transaction t, + public TestHashComponentsStreamMetadataTable getTestHashComponentsStreamMetadataTable(Transaction t, TestHashComponentsStreamMetadataTable.TestHashComponentsStreamMetadataTrigger... triggers) { return TestHashComponentsStreamMetadataTable.of(t, namespace, Triggers.getAllTriggers(t, sharedTriggers, triggers)); } @@ -138,104 +131,87 @@ public interface SharedTriggers extends KeyValueTable.KeyValueTrigger, StreamTes public abstract static class NullSharedTriggers implements SharedTriggers { @Override - public void putKeyValue( - Multimap> newRows) { + public void putKeyValue(Multimap> newRows) { // do nothing } @Override - public void putStreamTestMaxMemStreamHashAidx( - Multimap newRows) { + public void putStreamTestMaxMemStreamHashAidx(Multimap newRows) { // do nothing } @Override - public void putStreamTestMaxMemStreamIdx( - Multimap newRows) { + public void putStreamTestMaxMemStreamIdx(Multimap newRows) { // do nothing } @Override - public void putStreamTestMaxMemStreamMetadata( - Multimap> newRows) { + public void putStreamTestMaxMemStreamMetadata(Multimap> newRows) { // do nothing } @Override - public void putStreamTestMaxMemStreamValue( - Multimap> newRows) { + public void putStreamTestMaxMemStreamValue(Multimap> newRows) { // do nothing } @Override - public void putStreamTestStreamHashAidx( - Multimap newRows) { + public void putStreamTestStreamHashAidx(Multimap newRows) { // do nothing } @Override - public void putStreamTestStreamIdx( - Multimap newRows) { + public void putStreamTestStreamIdx(Multimap newRows) { // do nothing } @Override - public void putStreamTestStreamMetadata( - Multimap> newRows) { + public void putStreamTestStreamMetadata(Multimap> newRows) { // do nothing } @Override - public void putStreamTestStreamValue( - Multimap> newRows) { + public void putStreamTestStreamValue(Multimap> newRows) { // do nothing } @Override - public void putStreamTestWithHashStreamHashAidx( - Multimap newRows) { + public void putStreamTestWithHashStreamHashAidx(Multimap newRows) { // do nothing } @Override - public void putStreamTestWithHashStreamIdx( - Multimap newRows) { + public void putStreamTestWithHashStreamIdx(Multimap newRows) { // do nothing } @Override - public void putStreamTestWithHashStreamMetadata( - Multimap> newRows) { + public void putStreamTestWithHashStreamMetadata(Multimap> newRows) { // do nothing } @Override - public void putStreamTestWithHashStreamValue( - Multimap> newRows) { + public void putStreamTestWithHashStreamValue(Multimap> newRows) { // do nothing } @Override - public void putTestHashComponentsStreamHashAidx( - Multimap newRows) { + public void putTestHashComponentsStreamHashAidx(Multimap newRows) { // do nothing } @Override - public void putTestHashComponentsStreamIdx( - Multimap newRows) { + public void putTestHashComponentsStreamIdx(Multimap newRows) { // do nothing } @Override - public void putTestHashComponentsStreamMetadata( - Multimap> newRows) { + public void putTestHashComponentsStreamMetadata(Multimap> newRows) { // do nothing } @Override - public void putTestHashComponentsStreamValue( - Multimap> newRows) { + public void putTestHashComponentsStreamValue(Multimap> newRows) { // do nothing } } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamHashAidxTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamHashAidxTable.java index 20a9cedfef2..352b002bc41 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamHashAidxTable.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamHashAidxTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -713,5 +713,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "2ASIjXLcW69Qb5PP7ReI/A=="; + static String __CLASS_HASH = "WAs1Cyso9MG+qRz7sxvbNw=="; } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamIdxTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamIdxTable.java index 34d3a4fcec1..6a02e7f6584 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamIdxTable.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamIdxTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -727,5 +727,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "07NJD5lMKnG3aVtqn8iQJg=="; + static String __CLASS_HASH = "+6r8zM0UTE4/vU55y0KptA=="; } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamMetadataTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamMetadataTable.java index d3dda437e64..a44ab796133 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamMetadataTable.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamMetadataTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -695,5 +695,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "Zzb6mucVERw8UOL/5DyMbA=="; + static String __CLASS_HASH = "pVGawJaETifebtYT3F/T4Q=="; } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamStore.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamStore.java index b6ce1ead414..a003f7fd814 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamStore.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamStore.java @@ -47,6 +47,7 @@ import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.protos.generated.StreamPersistence.Status; import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata; +import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata.Builder; import com.palantir.atlasdb.stream.AbstractPersistentStreamStore; import com.palantir.atlasdb.stream.BlockConsumingInputStream; import com.palantir.atlasdb.stream.BlockGetter; @@ -131,7 +132,7 @@ private void touchMetadataWhileStoringForConflicts(Transaction t, Long id, long StreamTestWithHashStreamMetadataTable.StreamTestWithHashStreamMetadataRow row = StreamTestWithHashStreamMetadataTable.StreamTestWithHashStreamMetadataRow.of(id); StreamMetadata metadata = metaTable.getMetadatas(ImmutableSet.of(row)).values().iterator().next(); Preconditions.checkState(metadata.getStatus() == Status.STORING, "This stream is being cleaned up while storing blocks: %s", id); - StreamMetadata.Builder builder = StreamMetadata.newBuilder(metadata); + Builder builder = StreamMetadata.newBuilder(metadata); builder.setLength(blockNumber * BLOCK_SIZE_IN_BYTES + 1); metaTable.putMetadata(row, builder.build()); } @@ -445,6 +446,7 @@ protected void touchMetadataWhileMarkingUsedForConflicts(Transaction t, Iterable * {@link BlockGetter} * {@link BlockLoader} * {@link BufferedInputStream} + * {@link Builder} * {@link ByteArrayIOStream} * {@link ByteArrayInputStream} * {@link ByteStreams} diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamValueTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamValueTable.java index 292ac947f2d..83b1b7d4aef 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamValueTable.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamValueTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -683,5 +683,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "9/7p2zY/E85gdgo+joTObw=="; + static String __CLASS_HASH = "DuQnupgMKPT4lnevj8xrww=="; } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamHashAidxTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamHashAidxTable.java index 775ffc0f1c0..92aebe266db 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamHashAidxTable.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamHashAidxTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -713,5 +713,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "i+qmiQjlxAO0X69bZqTEHw=="; + static String __CLASS_HASH = "sFCttfGO7EQofqlyqvWtlA=="; } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamIdxTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamIdxTable.java index 6cbe9b837da..4fccfa3f322 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamIdxTable.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamIdxTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -727,5 +727,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "G9aQJCpolejByWJ/myDDgQ=="; + static String __CLASS_HASH = "WUJhPLtOVMnnlz7XwW6M/w=="; } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamMetadataTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamMetadataTable.java index fca549fd09d..564def00e57 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamMetadataTable.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamMetadataTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -695,5 +695,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "eo/+y7JSgtyMLp1rlM2fjA=="; + static String __CLASS_HASH = "Kab3YlNRdYChKU+cEiku0w=="; } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamStore.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamStore.java index 8f8b2202d8b..4ee0bbf27d0 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamStore.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamStore.java @@ -47,6 +47,7 @@ import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.protos.generated.StreamPersistence.Status; import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata; +import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata.Builder; import com.palantir.atlasdb.stream.AbstractPersistentStreamStore; import com.palantir.atlasdb.stream.BlockConsumingInputStream; import com.palantir.atlasdb.stream.BlockGetter; @@ -131,7 +132,7 @@ private void touchMetadataWhileStoringForConflicts(Transaction t, Long id, long TestHashComponentsStreamMetadataTable.TestHashComponentsStreamMetadataRow row = TestHashComponentsStreamMetadataTable.TestHashComponentsStreamMetadataRow.of(id); StreamMetadata metadata = metaTable.getMetadatas(ImmutableSet.of(row)).values().iterator().next(); Preconditions.checkState(metadata.getStatus() == Status.STORING, "This stream is being cleaned up while storing blocks: %s", id); - StreamMetadata.Builder builder = StreamMetadata.newBuilder(metadata); + Builder builder = StreamMetadata.newBuilder(metadata); builder.setLength(blockNumber * BLOCK_SIZE_IN_BYTES + 1); metaTable.putMetadata(row, builder.build()); } @@ -387,6 +388,7 @@ protected void touchMetadataWhileMarkingUsedForConflicts(Transaction t, Iterable * {@link BlockGetter} * {@link BlockLoader} * {@link BufferedInputStream} + * {@link Builder} * {@link ByteArrayIOStream} * {@link ByteArrayInputStream} * {@link ByteStreams} diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamValueTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamValueTable.java index 2f11375a2f7..fe95863fabb 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamValueTable.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/TestHashComponentsStreamValueTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -684,5 +684,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "nW7JkxQROnOLFkMfqtkoHA=="; + static String __CLASS_HASH = "WDrtA9lkyrgZzQza82MpIQ=="; } diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionTest.java index b0e46d5bfa8..a060fdffbf7 100644 --- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionTest.java +++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionTest.java @@ -53,7 +53,6 @@ import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; import java.util.stream.Collectors; import org.apache.commons.lang3.mutable.MutableInt; @@ -71,6 +70,7 @@ import org.junit.Test; import com.google.common.base.Joiner; +import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; diff --git a/commons-db/src/main/java/com/palantir/nexus/db/ConnectionSupplier.java b/commons-db/src/main/java/com/palantir/nexus/db/ConnectionSupplier.java index f4e4af9a291..8c684a94455 100644 --- a/commons-db/src/main/java/com/palantir/nexus/db/ConnectionSupplier.java +++ b/commons-db/src/main/java/com/palantir/nexus/db/ConnectionSupplier.java @@ -17,8 +17,8 @@ import java.io.Closeable; import java.sql.Connection; -import java.util.function.Supplier; +import com.google.common.base.Supplier; import com.palantir.exception.PalantirSqlException; public interface ConnectionSupplier extends Supplier, Closeable { diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnectionImpl.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnectionImpl.java index fde5c004cb7..916abf7ab51 100644 --- a/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnectionImpl.java +++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnectionImpl.java @@ -17,8 +17,8 @@ import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.function.Supplier; +import com.google.common.base.Supplier; import com.palantir.exception.PalantirInterruptedException; import com.palantir.exception.PalantirSqlException; import com.palantir.nexus.db.sql.SQLString.RegisteredSQLString; diff --git a/docs/source/release_notes/release-notes.rst b/docs/source/release_notes/release-notes.rst index 028189e7835..378cb2b29cb 100644 --- a/docs/source/release_notes/release-notes.rst +++ b/docs/source/release_notes/release-notes.rst @@ -50,10 +50,6 @@ develop * - Type - Change - * - |devbreak| - - Replaced all usages of guava Supplier by java Supplier. - (`Pull Request `__) - * - |improved| - The Timelock Availability Health check should not timeout if we can't reach other nodes. This should stop the health check firing erroneously. diff --git a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/ProfileTableFactory.java b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/ProfileTableFactory.java index f36a12107c8..e22b296ae5e 100644 --- a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/ProfileTableFactory.java +++ b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/ProfileTableFactory.java @@ -24,14 +24,12 @@ private ProfileTableFactory(List> this.namespace = namespace; } - public static ProfileTableFactory of( - List> sharedTriggers, + public static ProfileTableFactory of(List> sharedTriggers, Namespace namespace) { return new ProfileTableFactory(sharedTriggers, namespace); } - public static ProfileTableFactory of( - List> sharedTriggers) { + public static ProfileTableFactory of(List> sharedTriggers) { return new ProfileTableFactory(sharedTriggers, defaultNamespace); } @@ -73,32 +71,27 @@ public interface SharedTriggers extends UserPhotosStreamHashAidxTable.UserPhotos public abstract static class NullSharedTriggers implements SharedTriggers { @Override - public void putUserPhotosStreamHashAidx( - Multimap newRows) { + public void putUserPhotosStreamHashAidx(Multimap newRows) { // do nothing } @Override - public void putUserPhotosStreamIdx( - Multimap newRows) { + public void putUserPhotosStreamIdx(Multimap newRows) { // do nothing } @Override - public void putUserPhotosStreamMetadata( - Multimap> newRows) { + public void putUserPhotosStreamMetadata(Multimap> newRows) { // do nothing } @Override - public void putUserPhotosStreamValue( - Multimap> newRows) { + public void putUserPhotosStreamValue(Multimap> newRows) { // do nothing } @Override - public void putUserProfile( - Multimap> newRows) { + public void putUserProfile(Multimap> newRows) { // do nothing } } diff --git a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamHashAidxTable.java b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamHashAidxTable.java index a777d4e2151..fa8b6a08ac8 100644 --- a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamHashAidxTable.java +++ b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamHashAidxTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -713,5 +713,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "Vm1XC0scjjk1KU1gGw0Ubg=="; + static String __CLASS_HASH = "02INLh3XG7XrmmPfLsx4KQ=="; } diff --git a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamIdxTable.java b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamIdxTable.java index e9816ba6aaf..6fa9d0eeaae 100644 --- a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamIdxTable.java +++ b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamIdxTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -713,5 +713,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "nJFsPbXaBkqqtDXgoQVkuQ=="; + static String __CLASS_HASH = "3b/K8DhV3hQOpybiav1PxA=="; } diff --git a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamMetadataTable.java b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamMetadataTable.java index 6fdb3a69ff0..d27cef2750f 100644 --- a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamMetadataTable.java +++ b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamMetadataTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -681,5 +681,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "0MdVS+7yNGBENdW0vcRR4g=="; + static String __CLASS_HASH = "dzgGQC/ADP1dlAWGQYQKXg=="; } diff --git a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamStore.java b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamStore.java index 4850866f8a6..cef5f2f2221 100644 --- a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamStore.java +++ b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamStore.java @@ -47,6 +47,7 @@ import com.palantir.atlasdb.keyvalue.api.Cell; import com.palantir.atlasdb.protos.generated.StreamPersistence.Status; import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata; +import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata.Builder; import com.palantir.atlasdb.stream.AbstractPersistentStreamStore; import com.palantir.atlasdb.stream.BlockConsumingInputStream; import com.palantir.atlasdb.stream.BlockGetter; @@ -131,7 +132,7 @@ private void touchMetadataWhileStoringForConflicts(Transaction t, Long id, long UserPhotosStreamMetadataTable.UserPhotosStreamMetadataRow row = UserPhotosStreamMetadataTable.UserPhotosStreamMetadataRow.of(id); StreamMetadata metadata = metaTable.getMetadatas(ImmutableSet.of(row)).values().iterator().next(); Preconditions.checkState(metadata.getStatus() == Status.STORING, "This stream is being cleaned up while storing blocks: %s", id); - StreamMetadata.Builder builder = StreamMetadata.newBuilder(metadata); + Builder builder = StreamMetadata.newBuilder(metadata); builder.setLength(blockNumber * BLOCK_SIZE_IN_BYTES + 1); metaTable.putMetadata(row, builder.build()); } @@ -387,6 +388,7 @@ protected void touchMetadataWhileMarkingUsedForConflicts(Transaction t, Iterable * {@link BlockGetter} * {@link BlockLoader} * {@link BufferedInputStream} + * {@link Builder} * {@link ByteArrayIOStream} * {@link ByteArrayInputStream} * {@link ByteStreams} diff --git a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamValueTable.java b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamValueTable.java index da495d1fa59..5de1b00202e 100644 --- a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamValueTable.java +++ b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamValueTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -669,5 +669,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "ALz762RaYkJmjU1clfMg1Q=="; + static String __CLASS_HASH = "dhfdRzb+jI2Hx8yK47x24Q=="; } diff --git a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserProfileTable.java b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserProfileTable.java index 8131623a8e2..cec546ceb8a 100644 --- a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserProfileTable.java +++ b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserProfileTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; @@ -3200,5 +3200,5 @@ public List findConstraintFailuresNoRead(Map writes, * {@link UnsignedBytes} * {@link ValueType} */ - static String __CLASS_HASH = "90glu+qbIyo2vFb/CB2wWw=="; + static String __CLASS_HASH = "i1/fSbC65yELf1GNvIGF5Q=="; } diff --git a/leader-election-impl/src/main/java/com/palantir/leader/proxy/AwaitingLeadershipProxy.java b/leader-election-impl/src/main/java/com/palantir/leader/proxy/AwaitingLeadershipProxy.java index bd997f979c7..4b72d78df11 100644 --- a/leader-election-impl/src/main/java/com/palantir/leader/proxy/AwaitingLeadershipProxy.java +++ b/leader-election-impl/src/main/java/com/palantir/leader/proxy/AwaitingLeadershipProxy.java @@ -25,7 +25,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Supplier; import javax.annotation.Nullable; @@ -34,6 +33,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; +import com.google.common.base.Supplier; import com.google.common.net.HostAndPort; import com.google.common.reflect.AbstractInvocationHandler; import com.palantir.common.concurrent.PTExecutors; diff --git a/leader-election-impl/src/test/java/com/palantir/leader/proxy/AwaitingLeadershipProxyTest.java b/leader-election-impl/src/test/java/com/palantir/leader/proxy/AwaitingLeadershipProxyTest.java index e6c5847e14c..b89b3eba471 100644 --- a/leader-election-impl/src/test/java/com/palantir/leader/proxy/AwaitingLeadershipProxyTest.java +++ b/leader-election-impl/src/test/java/com/palantir/leader/proxy/AwaitingLeadershipProxyTest.java @@ -35,12 +35,12 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.LockSupport; -import java.util.function.Supplier; import org.junit.Before; import org.junit.Test; import org.mockito.stubbing.Answer; +import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.google.common.net.HostAndPort; import com.google.common.util.concurrent.Uninterruptibles; diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/LegacyTimelockService.java b/lock-impl/src/main/java/com/palantir/lock/impl/LegacyTimelockService.java index 3f3e04076ef..2afc4c4a669 100644 --- a/lock-impl/src/main/java/com/palantir/lock/impl/LegacyTimelockService.java +++ b/lock-impl/src/main/java/com/palantir/lock/impl/LegacyTimelockService.java @@ -31,10 +31,14 @@ import com.palantir.lock.LockRefreshToken; import com.palantir.lock.LockService; import com.palantir.lock.SimpleTimeDuration; +import com.palantir.lock.v2.IdentifiedTimeLockRequest; +import com.palantir.lock.v2.ImmutableIdentifiedTimeLockRequest; import com.palantir.lock.v2.LockImmutableTimestampResponse; import com.palantir.lock.v2.LockRequest; import com.palantir.lock.v2.LockResponse; import com.palantir.lock.v2.LockToken; +import com.palantir.lock.v2.StartIdentifiedAtlasDbTransactionRequest; +import com.palantir.lock.v2.StartAtlasDbTransactionResponse; import com.palantir.lock.v2.StartIdentifiedAtlasDbTransactionResponse; import com.palantir.lock.v2.TimelockService; import com.palantir.lock.v2.TimestampAndPartition; diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceImpl.java b/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceImpl.java index 6d6af3e6dcc..a44c3707832 100644 --- a/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceImpl.java +++ b/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceImpl.java @@ -37,7 +37,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Supplier; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; @@ -53,6 +52,7 @@ import com.google.common.base.Function; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; +import com.google.common.base.Supplier; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -102,8 +102,8 @@ import com.palantir.lock.logger.LockServiceStateLogger; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; -import com.palantir.util.JMXUtils; import com.palantir.util.Ownable; +import com.palantir.util.JMXUtils; /** * Implementation of the Lock Server. diff --git a/lock-impl/src/test/java/com/palantir/lock/impl/LegacyTimelockServiceTest.java b/lock-impl/src/test/java/com/palantir/lock/impl/LegacyTimelockServiceTest.java index 1728b3de233..8845ff0610a 100644 --- a/lock-impl/src/test/java/com/palantir/lock/impl/LegacyTimelockServiceTest.java +++ b/lock-impl/src/test/java/com/palantir/lock/impl/LegacyTimelockServiceTest.java @@ -42,6 +42,7 @@ import com.palantir.lock.LockService; import com.palantir.lock.SimpleTimeDuration; import com.palantir.lock.StringLockDescriptor; +import com.palantir.lock.v2.IdentifiedTimeLockRequest; import com.palantir.lock.v2.LockImmutableTimestampResponse; import com.palantir.lock.v2.LockRequest; import com.palantir.lock.v2.LockResponse; diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockResource.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockResource.java index 3a7bab200ce..82e9d67c3c0 100644 --- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockResource.java +++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockResource.java @@ -31,19 +31,19 @@ import com.palantir.atlasdb.timelock.lock.Leased; import com.palantir.atlasdb.timelock.lock.LockLog; import com.palantir.lock.client.IdentifiedLockRequest; -import com.palantir.lock.v2.IdentifiedTimeLockRequest; +import com.palantir.lock.v2.StartTransactionResponseV4; +import com.palantir.lock.v2.StartTransactionRequestV4; import com.palantir.lock.v2.LeaderTime; -import com.palantir.lock.v2.LockImmutableTimestampResponse; -import com.palantir.lock.v2.LockResponse; +import com.palantir.lock.v2.IdentifiedTimeLockRequest; import com.palantir.lock.v2.LockResponseV2; -import com.palantir.lock.v2.LockToken; import com.palantir.lock.v2.RefreshLockResponseV2; -import com.palantir.lock.v2.StartAtlasDbTransactionResponse; import com.palantir.lock.v2.StartAtlasDbTransactionResponseV3; +import com.palantir.lock.v2.LockImmutableTimestampResponse; +import com.palantir.lock.v2.LockResponse; +import com.palantir.lock.v2.LockToken; import com.palantir.lock.v2.StartIdentifiedAtlasDbTransactionRequest; +import com.palantir.lock.v2.StartAtlasDbTransactionResponse; import com.palantir.lock.v2.StartIdentifiedAtlasDbTransactionResponse; -import com.palantir.lock.v2.StartTransactionRequestV4; -import com.palantir.lock.v2.StartTransactionResponseV4; import com.palantir.lock.v2.WaitForLocksRequest; import com.palantir.lock.v2.WaitForLocksResponse; import com.palantir.logsafe.Safe; diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLockService.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLockService.java index c1dbdae58db..cecaf95cbd0 100644 --- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLockService.java +++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLockService.java @@ -29,8 +29,8 @@ import com.google.common.collect.ImmutableSet; import com.palantir.lock.LockDescriptor; import com.palantir.lock.v2.LeaderTime; -import com.palantir.lock.v2.LockToken; import com.palantir.lock.v2.RefreshLockResponseV2; +import com.palantir.lock.v2.LockToken; public class AsyncLockService implements Closeable { diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStoreTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStoreTest.java index d15ed64bfb5..aa8459f5d89 100644 --- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStoreTest.java +++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStoreTest.java @@ -26,10 +26,12 @@ import java.io.File; import java.io.IOException; import java.util.List; +import java.util.Map; import java.util.UUID; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.stream.Collectors; import javax.annotation.Nullable; diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/BenchmarksTableFactory.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/BenchmarksTableFactory.java index f66db66cdb0..310a056fd7d 100644 --- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/BenchmarksTableFactory.java +++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/BenchmarksTableFactory.java @@ -1,15 +1,14 @@ package com.palantir.atlasdb.timelock.benchmarks.schema.generated; -import java.util.List; - -import javax.annotation.Generated; - import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Multimap; import com.palantir.atlasdb.keyvalue.api.Namespace; import com.palantir.atlasdb.table.generation.Triggers; import com.palantir.atlasdb.transaction.api.Transaction; +import java.lang.Override; +import java.util.List; +import javax.annotation.Generated; @Generated("com.palantir.atlasdb.table.description.render.TableFactoryRenderer") public final class BenchmarksTableFactory { diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/BlobsSerializableTable.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/BlobsSerializableTable.java index 2f2088d764b..6ad6e5bd646 100644 --- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/BlobsSerializableTable.java +++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/BlobsSerializableTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/BlobsTable.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/BlobsTable.java index d09660940b3..7c2f7d4a22b 100644 --- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/BlobsTable.java +++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/BlobsTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/KvDynamicColumnsTable.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/KvDynamicColumnsTable.java index 179cc51b0e1..2baa7589606 100644 --- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/KvDynamicColumnsTable.java +++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/KvDynamicColumnsTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/KvRowsTable.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/KvRowsTable.java index 0f189b1d8a5..85abb6c73bb 100644 --- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/KvRowsTable.java +++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/KvRowsTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain; diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/MetadataTable.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/MetadataTable.java index 106d4d4153e..0b3fd88d33a 100644 --- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/MetadataTable.java +++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/generated/MetadataTable.java @@ -16,7 +16,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Generated; @@ -24,6 +23,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ComparisonChain;