From 32074d6ec5886f5fd5bcdb0ee2d4b46880061c2c Mon Sep 17 00:00:00 2001
From: hsiang-c <huangc@apple.com>
Date: Fri, 7 Jul 2023 12:38:56 +0800
Subject: [PATCH] Switch to Guava's Lists

---
 .../iceberg/spark/source/TestIcebergSourceTablesBase.java | 8 ++------
 .../iceberg/spark/source/TestIcebergSourceTablesBase.java | 8 ++------
 .../iceberg/spark/source/TestIcebergSourceTablesBase.java | 8 ++------
 .../iceberg/spark/source/TestIcebergSourceTablesBase.java | 8 ++------
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/spark/v3.1/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java b/spark/v3.1/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
index d49a7680bbe2..21ae3f7f668a 100644
--- a/spark/v3.1/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
+++ b/spark/v3.1/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
@@ -2058,15 +2058,11 @@ public static Types.StructType nonDerivedSchema(Dataset<Row> metadataTable) {
   }
 
   private long totalSizeInBytes(Iterable<DataFile> dataFiles) {
-    return StreamSupport.stream(dataFiles.spliterator(), false)
-        .mapToLong(DataFile::fileSizeInBytes)
-        .sum();
+    return Lists.newArrayList(dataFiles).stream().mapToLong(DataFile::fileSizeInBytes).sum();
   }
 
   private List<DataFile> dataFiles(Table table, long commitId) {
-    return StreamSupport.stream(
-            table.snapshot(commitId).addedDataFiles(table.io()).spliterator(), false)
-        .collect(Collectors.toList());
+    return Lists.newArrayList(table.snapshot(commitId).addedDataFiles(table.io()));
   }
 
   private void assertDataFilePartitions(
diff --git a/spark/v3.2/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java b/spark/v3.2/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
index ad2b07f7e01c..c32eb6192515 100644
--- a/spark/v3.2/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
+++ b/spark/v3.2/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
@@ -2195,15 +2195,11 @@ private DeleteFile writeEqDeleteFile(Table table) {
   }
 
   private long totalSizeInBytes(Iterable<DataFile> dataFiles) {
-    return StreamSupport.stream(dataFiles.spliterator(), false)
-        .mapToLong(DataFile::fileSizeInBytes)
-        .sum();
+    return Lists.newArrayList(dataFiles).stream().mapToLong(DataFile::fileSizeInBytes).sum();
   }
 
   private List<DataFile> dataFiles(Table table, long commitId) {
-    return StreamSupport.stream(
-            table.snapshot(commitId).addedDataFiles(table.io()).spliterator(), false)
-        .collect(Collectors.toList());
+    return Lists.newArrayList(table.snapshot(commitId).addedDataFiles(table.io()));
   }
 
   private void assertDataFilePartitions(
diff --git a/spark/v3.3/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java b/spark/v3.3/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
index c72947985ca1..2d0bd55d2af2 100644
--- a/spark/v3.3/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
+++ b/spark/v3.3/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
@@ -2262,15 +2262,11 @@ private DeleteFile writeEqDeleteFile(Table table) {
   }
 
   private long totalSizeInBytes(Iterable<DataFile> dataFiles) {
-    return StreamSupport.stream(dataFiles.spliterator(), false)
-        .mapToLong(DataFile::fileSizeInBytes)
-        .sum();
+    return Lists.newArrayList(dataFiles).stream().mapToLong(DataFile::fileSizeInBytes).sum();
   }
 
   private List<DataFile> dataFiles(Table table, long commitId) {
-    return StreamSupport.stream(
-            table.snapshot(commitId).addedDataFiles(table.io()).spliterator(), false)
-        .collect(Collectors.toList());
+    return Lists.newArrayList(table.snapshot(commitId).addedDataFiles(table.io()));
   }
 
   private void assertDataFilePartitions(
diff --git a/spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java b/spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
index f1c531bc36a9..dc494884fb94 100644
--- a/spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
+++ b/spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
@@ -2259,15 +2259,11 @@ private DeleteFile writeEqDeleteFile(Table table) {
   }
 
   private long totalSizeInBytes(Iterable<DataFile> dataFiles) {
-    return StreamSupport.stream(dataFiles.spliterator(), false)
-        .mapToLong(DataFile::fileSizeInBytes)
-        .sum();
+    return Lists.newArrayList(dataFiles).stream().mapToLong(DataFile::fileSizeInBytes).sum();
   }
 
   private List<DataFile> dataFiles(Table table, long commitId) {
-    return StreamSupport.stream(
-            table.snapshot(commitId).addedDataFiles(table.io()).spliterator(), false)
-        .collect(Collectors.toList());
+    return Lists.newArrayList(table.snapshot(commitId).addedDataFiles(table.io()));
   }
 
   private void assertDataFilePartitions(