Gozakdag/revert supplier change (#3995)

* Revert "Remove usages of guava Supplier (#3978)"

This reverts commit 17864ae.

* use guava supplier

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;

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<String> version = Suppliers.memoize(AtlasDbVersion::readVersion);
+    private static final Supplier<String> version = Suppliers.memoize(() -> readVersion());
 
     private AtlasDbVersion() {
         // static class

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<CassandraKeyValueServiceRuntimeConfig> runtimeConfig,
+            java.util.function.Supplier<CassandraKeyValueServiceRuntimeConfig> runtimeConfig,
             CassandraMutationTimestampProvider mutationTimestampProvider,
             boolean initializeAsync) {
         return create(metricsManager,

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;

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;

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;

atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/AllValueTypesTestTable.java

@@ -16,14 +16,14 @@
 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;
 
 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<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "r4GAOsoxikdmFU+sqUQzQA==";
+    static String __CLASS_HASH = "7ICgYboWGmlASXKikUY+zQ==";
 }

atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/ApiTestTableFactory.java

@@ -24,14 +24,12 @@ private ApiTestTableFactory(List<Function<? super Transaction, SharedTriggers>>
         this.namespace = namespace;
     }
 
-    public static ApiTestTableFactory of(
-            List<Function<? super Transaction, SharedTriggers>> sharedTriggers,
+    public static ApiTestTableFactory of(List<Function<? super Transaction, SharedTriggers>> sharedTriggers,
             Namespace namespace) {
         return new ApiTestTableFactory(sharedTriggers, namespace);
     }
 
-    public static ApiTestTableFactory of(
-            List<Function<? super Transaction, SharedTriggers>> sharedTriggers) {
+    public static ApiTestTableFactory of(List<Function<? super Transaction, SharedTriggers>> 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<AllValueTypesTestTable.AllValueTypesTestRow, ? extends AllValueTypesTestTable.AllValueTypesTestNamedColumnValue<?>> newRows) {
+        public void putAllValueTypesTest(Multimap<AllValueTypesTestTable.AllValueTypesTestRow, ? extends AllValueTypesTestTable.AllValueTypesTestNamedColumnValue<?>> newRows) {
             // do nothing
         }
 
         @Override
-        public void putHashComponentsTest(
-                Multimap<HashComponentsTestTable.HashComponentsTestRow, ? extends HashComponentsTestTable.HashComponentsTestNamedColumnValue<?>> newRows) {
+        public void putHashComponentsTest(Multimap<HashComponentsTestTable.HashComponentsTestRow, ? extends HashComponentsTestTable.HashComponentsTestNamedColumnValue<?>> newRows) {
             // do nothing
         }
 
         @Override
-        public void putSchemaApiTest(
-                Multimap<SchemaApiTestTable.SchemaApiTestRow, ? extends SchemaApiTestTable.SchemaApiTestNamedColumnValue<?>> newRows) {
+        public void putSchemaApiTest(Multimap<SchemaApiTestTable.SchemaApiTestRow, ? extends SchemaApiTestTable.SchemaApiTestNamedColumnValue<?>> newRows) {
             // do nothing
         }
     }

atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/HashComponentsTestTable.java

@@ -16,14 +16,14 @@
 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;
 
 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<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "wcMKuy9F9wZNt8f7UQPeUg==";
+    static String __CLASS_HASH = "D7jBjvqrJyVDhFQlvw9TRA==";
 }

atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/generated/SchemaApiTestTable.java

@@ -16,14 +16,14 @@
 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;
 
 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<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "h9whmxJpFX2yqVXafsa5AQ==";
+    static String __CLASS_HASH = "gJjGs7nehodvK83lsXBdyA==";
 }

atlasdb-client/src/main/java/com/palantir/atlasdb/cache/TimestampCache.java

@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb.cache;
 
-import java.util.function.Supplier;
-
 import javax.annotation.Nullable;
 
 import com.codahale.metrics.MetricRegistry;
 import com.github.benmanes.caffeine.cache.Cache;
 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 {

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;

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;

atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/CompactMetadataTable.java

@@ -16,14 +16,14 @@
 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;
 
 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<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "vX96N598CtO5B/gkmgCmsg==";
+    static String __CLASS_HASH = "0WtSpbMMOvlM3AribPiPxQ==";
 }

atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/CompactTableFactory.java

@@ -24,14 +24,12 @@ private CompactTableFactory(List<Function<? super Transaction, SharedTriggers>>
         this.namespace = namespace;
     }
 
-    public static CompactTableFactory of(
-            List<Function<? super Transaction, SharedTriggers>> sharedTriggers,
+    public static CompactTableFactory of(List<Function<? super Transaction, SharedTriggers>> sharedTriggers,
             Namespace namespace) {
         return new CompactTableFactory(sharedTriggers, namespace);
     }
 
-    public static CompactTableFactory of(
-            List<Function<? super Transaction, SharedTriggers>> sharedTriggers) {
+    public static CompactTableFactory of(List<Function<? super Transaction, SharedTriggers>> 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<CompactMetadataTable.CompactMetadataRow, ? extends CompactMetadataTable.CompactMetadataNamedColumnValue<?>> newRows) {
+        public void putCompactMetadata(Multimap<CompactMetadataTable.CompactMetadataRow, ? extends CompactMetadataTable.CompactMetadataNamedColumnValue<?>> newRows) {
             // do nothing
         }
     }

atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepIdToNameTable.java

@@ -16,14 +16,14 @@
 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;
 
 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;

atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepNameToIdTable.java

@@ -16,14 +16,14 @@
 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;
 
 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;

atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepPriorityTable.java

@@ -16,14 +16,14 @@
 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;
 
 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<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "P4pMrqwez6sbaQ8bCukCWA==";
+    static String __CLASS_HASH = "SQZh8Tiuo9hisseHEHNpnA==";
 }

atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepShardProgressTable.java

@@ -16,14 +16,14 @@
 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;
 
 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;

atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepTableFactory.java

@@ -24,14 +24,12 @@ private SweepTableFactory(List<Function<? super Transaction, SharedTriggers>> sh
         this.namespace = namespace;
     }
 
-    public static SweepTableFactory of(
-            List<Function<? super Transaction, SharedTriggers>> sharedTriggers,
+    public static SweepTableFactory of(List<Function<? super Transaction, SharedTriggers>> sharedTriggers,
             Namespace namespace) {
         return new SweepTableFactory(sharedTriggers, namespace);
     }
 
-    public static SweepTableFactory of(
-            List<Function<? super Transaction, SharedTriggers>> sharedTriggers) {
+    public static SweepTableFactory of(List<Function<? super Transaction, SharedTriggers>> 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<SweepPriorityTable.SweepPriorityRow, ? extends SweepPriorityTable.SweepPriorityNamedColumnValue<?>> newRows) {
+        public void putSweepPriority(Multimap<SweepPriorityTable.SweepPriorityRow, ? extends SweepPriorityTable.SweepPriorityNamedColumnValue<?>> newRows) {
             // do nothing
         }
     }

atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepableCellsTable.java

@@ -16,14 +16,14 @@
 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;
 
 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;