From b1c77b7df3b8abfeffbfdedcdd7bf0fe95bbcbd5 Mon Sep 17 00:00:00 2001
From: kak <kak@google.com>
Date: Tue, 18 Feb 2020 11:35:21 -0800
Subject: [PATCH] Annotate FluentIterable.from(FluentIterable) with @DoNotCall

RELNOTES=Annotate FluentIterable.from(FluentIterable) with @DoNotCall

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=295783622
---
 .../test/com/google/common/collect/FluentIterableTest.java      | 2 +-
 android/guava/src/com/google/common/collect/FluentIterable.java | 2 ++
 .../test/com/google/common/collect/FluentIterableTest.java      | 2 +-
 guava/src/com/google/common/collect/FluentIterable.java         | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/android/guava-tests/test/com/google/common/collect/FluentIterableTest.java b/android/guava-tests/test/com/google/common/collect/FluentIterableTest.java
index e623f31d2f36..2d3143d97b6a 100644
--- a/android/guava-tests/test/com/google/common/collect/FluentIterableTest.java
+++ b/android/guava-tests/test/com/google/common/collect/FluentIterableTest.java
@@ -76,7 +76,7 @@ public void testFrom() {
         Lists.newArrayList(FluentIterable.from(ImmutableList.of(1, 2, 3, 4))));
   }
 
-  @SuppressWarnings("deprecation") // test of deprecated method
+  @SuppressWarnings({"deprecation", "DoNotCall"}) // test of deprecated method
   public void testFrom_alreadyFluentIterable() {
     FluentIterable<Integer> iterable = FluentIterable.from(asList(1));
     assertSame(iterable, FluentIterable.from(iterable));
diff --git a/android/guava/src/com/google/common/collect/FluentIterable.java b/android/guava/src/com/google/common/collect/FluentIterable.java
index 6a3c48b6eea9..4c2e35a8c777 100644
--- a/android/guava/src/com/google/common/collect/FluentIterable.java
+++ b/android/guava/src/com/google/common/collect/FluentIterable.java
@@ -24,6 +24,7 @@
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import com.google.errorprone.annotations.DoNotCall;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
@@ -173,6 +174,7 @@ public static <E> FluentIterable<E> from(E[] elements) {
    *     FluentIterable}
    */
   @Deprecated
+  @DoNotCall("instances of FluentIterable don't need to be converetd to a FluentIterable")
   public static <E> FluentIterable<E> from(FluentIterable<E> iterable) {
     return checkNotNull(iterable);
   }
diff --git a/guava-tests/test/com/google/common/collect/FluentIterableTest.java b/guava-tests/test/com/google/common/collect/FluentIterableTest.java
index 6a9c2d73f6ec..56d4b1fd2b8a 100644
--- a/guava-tests/test/com/google/common/collect/FluentIterableTest.java
+++ b/guava-tests/test/com/google/common/collect/FluentIterableTest.java
@@ -80,7 +80,7 @@ public void testFrom() {
         Lists.newArrayList(FluentIterable.from(ImmutableList.of(1, 2, 3, 4))));
   }
 
-  @SuppressWarnings("deprecation") // test of deprecated method
+  @SuppressWarnings({"deprecation", "DoNotCall"}) // test of deprecated method
   public void testFrom_alreadyFluentIterable() {
     FluentIterable<Integer> iterable = FluentIterable.from(asList(1));
     assertSame(iterable, FluentIterable.from(iterable));
diff --git a/guava/src/com/google/common/collect/FluentIterable.java b/guava/src/com/google/common/collect/FluentIterable.java
index 0374cd64e81c..420c96876177 100644
--- a/guava/src/com/google/common/collect/FluentIterable.java
+++ b/guava/src/com/google/common/collect/FluentIterable.java
@@ -24,6 +24,7 @@
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import com.google.errorprone.annotations.DoNotCall;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
@@ -170,6 +171,7 @@ public static <E> FluentIterable<E> from(E[] elements) {
    *     FluentIterable}
    */
   @Deprecated
+  @DoNotCall("instances of FluentIterable don't need to be converetd to a FluentIterable")
   public static <E> FluentIterable<E> from(FluentIterable<E> iterable) {
     return checkNotNull(iterable);
   }