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 2d3143d97b6a..e623f31d2f36 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", "DoNotCall"}) // test of deprecated method + @SuppressWarnings("deprecation") // test of deprecated method public void testFrom_alreadyFluentIterable() { FluentIterable 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 a355cc4210cc..6a3c48b6eea9 100644 --- a/android/guava/src/com/google/common/collect/FluentIterable.java +++ b/android/guava/src/com/google/common/collect/FluentIterable.java @@ -24,7 +24,6 @@ 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; @@ -174,7 +173,6 @@ public static FluentIterable from(E[] elements) { * FluentIterable} */ @Deprecated - @DoNotCall("instances of FluentIterable don't need to be converted to a FluentIterable") public static FluentIterable from(FluentIterable 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 56d4b1fd2b8a..6a9c2d73f6ec 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", "DoNotCall"}) // test of deprecated method + @SuppressWarnings("deprecation") // test of deprecated method public void testFrom_alreadyFluentIterable() { FluentIterable 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 3acf75a99435..0374cd64e81c 100644 --- a/guava/src/com/google/common/collect/FluentIterable.java +++ b/guava/src/com/google/common/collect/FluentIterable.java @@ -24,7 +24,6 @@ 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; @@ -171,7 +170,6 @@ public static FluentIterable from(E[] elements) { * FluentIterable} */ @Deprecated - @DoNotCall("instances of FluentIterable don't need to be converted to a FluentIterable") public static FluentIterable from(FluentIterable iterable) { return checkNotNull(iterable); }