From 3a65e11d3c2b9fc0f0d1af7bd8fd2322d7d5d5a8 Mon Sep 17 00:00:00 2001
From: cpovirk <cpovirk@google.com>
Date: Fri, 19 Apr 2024 15:20:20 -0700
Subject: [PATCH] Add a missing `@since` tag, and remove `@FunctionalInterface`
 from a package-private method.

(The latter prepares for [Android compatibility for Java 8 APIs](https://github.com/google/guava/issues/6567).)

RELNOTES=n/a
PiperOrigin-RevId: 626483101
---
 .../google/common/collect/testing/SpliteratorTester.java    | 6 +++++-
 .../src/com/google/common/collect/CollectSpliterators.java  | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/guava-testlib/src/com/google/common/collect/testing/SpliteratorTester.java b/guava-testlib/src/com/google/common/collect/testing/SpliteratorTester.java
index d6a866ce194b..d3251d47de2c 100644
--- a/guava-testlib/src/com/google/common/collect/testing/SpliteratorTester.java
+++ b/guava-testlib/src/com/google/common/collect/testing/SpliteratorTester.java
@@ -45,7 +45,11 @@
 import java.util.function.Supplier;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-/** Tester for {@code Spliterator} implementations. */
+/**
+ * Tester for {@code Spliterator} implementations.
+ *
+ * @since 21.0
+ */
 @GwtCompatible
 @ElementTypesAreNonnullByDefault
 public final class SpliteratorTester<E extends @Nullable Object> {
diff --git a/guava/src/com/google/common/collect/CollectSpliterators.java b/guava/src/com/google/common/collect/CollectSpliterators.java
index e2242db6d25c..b7bec7e7afd7 100644
--- a/guava/src/com/google/common/collect/CollectSpliterators.java
+++ b/guava/src/com/google/common/collect/CollectSpliterators.java
@@ -309,7 +309,6 @@ abstract static class FlatMapSpliterator<
           OutSpliteratorT extends Spliterator<OutElementT>>
       implements Spliterator<OutElementT> {
     /** Factory for constructing {@link FlatMapSpliterator} instances. */
-    @FunctionalInterface
     interface Factory<InElementT extends @Nullable Object, OutSpliteratorT extends Spliterator<?>> {
       OutSpliteratorT newFlatMapSpliterator(
           @CheckForNull OutSpliteratorT prefix,