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
google · Feb 19, 2020 · b1c77b7 · b1c77b7
1 parent 4941afc
commit b1c77b7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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);
   }