Remove unnecessary use of Guava functional interfaces

presto-cassandra/src/main/java/io/prestosql/plugin/cassandra/NativeCassandraSession.java

@@ -37,7 +37,6 @@
 import com.datastax.driver.core.querybuilder.Clause;
 import com.datastax.driver.core.querybuilder.QueryBuilder;
 import com.datastax.driver.core.querybuilder.Select;
-import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
@@ -63,6 +62,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.stream.Stream;
 
 import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;

presto-hive/src/test/java/io/prestosql/plugin/hive/AbstractTestHiveFileSystem.java

@@ -13,7 +13,6 @@
  */
 package io.prestosql.plugin.hive;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
@@ -76,6 +75,7 @@
 import java.util.UUID;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
+import java.util.function.Function;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.Iterables.getOnlyElement;

presto-main/src/main/java/io/prestosql/connector/system/SystemTransactionHandle.java

@@ -15,12 +15,12 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import io.prestosql.spi.connector.ConnectorTransactionHandle;
 import io.prestosql.transaction.TransactionId;
 
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static java.util.Objects.requireNonNull;

presto-main/src/main/java/io/prestosql/execution/SqlTask.java

@@ -13,7 +13,6 @@
  */
 package io.prestosql.execution;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.Futures;
@@ -51,6 +50,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;

presto-main/src/main/java/io/prestosql/execution/scheduler/NodeScheduler.java

@@ -13,7 +13,6 @@
  */
 package io.prestosql.execution.scheduler;
 
-import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
@@ -49,6 +48,7 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;

presto-main/src/main/java/io/prestosql/execution/scheduler/SimpleNodeSelector.java

@@ -14,7 +14,6 @@
 package io.prestosql.execution.scheduler;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
@@ -41,6 +40,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
 
 import static io.prestosql.execution.scheduler.NodeScheduler.calculateLowWatermark;
 import static io.prestosql.execution.scheduler.NodeScheduler.randomizedNodes;

presto-main/src/main/java/io/prestosql/execution/scheduler/TopologyAwareNodeSelector.java

@@ -13,7 +13,6 @@
  */
 package io.prestosql.execution.scheduler;
 
-import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
@@ -36,6 +35,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
 
 import static io.prestosql.execution.scheduler.NetworkLocation.ROOT_LOCATION;
 import static io.prestosql.execution.scheduler.NodeScheduler.calculateLowWatermark;

presto-main/src/main/java/io/prestosql/metadata/QualifiedObjectName.java

@@ -15,7 +15,6 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.google.common.base.Function;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import io.prestosql.spi.connector.CatalogSchemaTableName;
@@ -24,6 +23,7 @@
 import javax.annotation.concurrent.Immutable;
 
 import java.util.Objects;
+import java.util.function.Function;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.prestosql.metadata.MetadataUtil.checkObjectName;

presto-main/src/main/java/io/prestosql/operator/aggregation/LazyAccumulatorFactoryBinder.java

@@ -14,7 +14,6 @@
 package io.prestosql.operator.aggregation;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import io.airlift.bytecode.DynamicClassLoader;
 import io.prestosql.Session;
@@ -25,6 +24,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 public class LazyAccumulatorFactoryBinder
         implements AccumulatorFactoryBinder

presto-main/src/main/java/io/prestosql/util/MoreLists.java

@@ -23,6 +23,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.Streams.stream;
 import static java.util.Objects.requireNonNull;
 
 public final class MoreLists
@@ -34,20 +35,20 @@ public static <T> List<List<T>> listOfListsCopy(List<List<T>> lists)
                 .collect(toImmutableList());
     }
 
-    public static <T> List<T> filteredCopy(List<T> elements, Predicate<T> predicate)
+    public static <T> List<T> filteredCopy(Iterable<T> elements, Predicate<T> predicate)
     {
         requireNonNull(elements, "elements is null");
         requireNonNull(predicate, "predicate is null");
-        return elements.stream()
+        return stream(elements)
                 .filter(predicate)
                 .collect(toImmutableList());
     }
 
-    public static <T, R> List<R> mappedCopy(List<T> elements, Function<T, R> mapper)
+    public static <T, R> List<R> mappedCopy(Iterable<T> elements, Function<T, R> mapper)
     {
         requireNonNull(elements, "elements is null");
         requireNonNull(mapper, "mapper is null");
-        return elements.stream()
+        return stream(elements)
                 .map(mapper)
                 .collect(toImmutableList());
     }

presto-main/src/test/java/io/prestosql/execution/scheduler/TestSourcePartitionedScheduler.java

@@ -13,7 +13,6 @@
  */
 package io.prestosql.execution.scheduler;
 
-import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
@@ -68,6 +67,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.function.Supplier;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;

presto-main/src/test/java/io/prestosql/memory/TestMemoryPools.java

@@ -14,7 +14,6 @@
 package io.prestosql.memory;
 
 import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.Futures;
@@ -47,6 +46,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 import static com.google.common.base.Preconditions.checkState;
 import static io.airlift.units.DataSize.Unit.BYTE;

presto-tests/src/main/java/io/prestosql/tests/TestingPrestoClient.java

@@ -13,7 +13,6 @@
  */
 package io.prestosql.tests;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import io.prestosql.Session;
 import io.prestosql.client.IntervalDayTime;
@@ -51,10 +50,10 @@
 import java.util.OptionalLong;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Iterables.transform;
 import static io.prestosql.spi.type.BigintType.BIGINT;
 import static io.prestosql.spi.type.BooleanType.BOOLEAN;
 import static io.prestosql.spi.type.Chars.isCharType;
@@ -74,6 +73,7 @@
 import static io.prestosql.type.IntervalYearMonthType.INTERVAL_YEAR_MONTH;
 import static io.prestosql.type.JsonType.JSON;
 import static io.prestosql.type.UuidType.UUID;
+import static io.prestosql.util.MoreLists.mappedCopy;
 import static java.util.stream.Collectors.toList;
 
 public class TestingPrestoClient
@@ -133,7 +133,7 @@ public void addResults(QueryStatusInfo statusInfo, QueryData data)
 
             if (data.getData() != null) {
                 checkState(types.get() != null, "data received without types");
-                rows.addAll(transform(data.getData(), dataToRow(types.get())));
+                rows.addAll(mappedCopy(data.getData(), dataToRow(types.get())));
             }
         }
 

presto-tests/src/main/java/io/prestosql/tests/tpch/TpchConnectorIndex.java

@@ -13,13 +13,14 @@
  */
 package io.prestosql.tests.tpch;
 
-import com.google.common.base.Function;
 import io.prestosql.spi.connector.ConnectorIndex;
 import io.prestosql.spi.connector.ConnectorPageSource;
 import io.prestosql.spi.connector.RecordPageSource;
 import io.prestosql.spi.connector.RecordSet;
 import io.prestosql.tests.tpch.TpchIndexedData.IndexedTable;
 
+import java.util.function.Function;
+
 import static java.util.Objects.requireNonNull;
 
 class TpchConnectorIndex

presto-tests/src/main/java/io/prestosql/tests/tpch/TpchIndexProvider.java

@@ -13,7 +13,6 @@
  */
 package io.prestosql.tests.tpch;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import io.prestosql.plugin.tpch.TpchColumnHandle;
 import io.prestosql.spi.connector.ColumnHandle;
@@ -32,6 +31,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;