diff --git a/android/guava/src/com/google/common/collect/FluentIterable.java b/android/guava/src/com/google/common/collect/FluentIterable.java index 3811ae559595..81b79b3b6591 100644 --- a/android/guava/src/com/google/common/collect/FluentIterable.java +++ b/android/guava/src/com/google/common/collect/FluentIterable.java @@ -16,7 +16,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.base.Function; @@ -163,7 +162,6 @@ public Iterator iterator() { * * @since 20.0 (since 18.0 as an overload of {@code of}) */ - @Beta public static FluentIterable from(E[] elements) { return from(Arrays.asList(elements)); } @@ -196,7 +194,6 @@ public Iterator iterator() { * * @since 20.0 */ - @Beta public static FluentIterable concat( Iterable a, Iterable b) { return concatNoDefensiveCopy(a, b); @@ -215,7 +212,6 @@ public Iterator iterator() { * * @since 20.0 */ - @Beta public static FluentIterable concat( Iterable a, Iterable b, Iterable c) { return concatNoDefensiveCopy(a, b, c); @@ -235,7 +231,6 @@ public Iterator iterator() { * * @since 20.0 */ - @Beta public static FluentIterable concat( Iterable a, Iterable b, @@ -259,7 +254,6 @@ public Iterator iterator() { * @throws NullPointerException if any of the provided iterables is {@code null} * @since 20.0 */ - @Beta public static FluentIterable concat( Iterable... inputs) { return concatNoDefensiveCopy(Arrays.copyOf(inputs, inputs.length)); @@ -279,7 +273,6 @@ public Iterator iterator() { * * @since 20.0 */ - @Beta public static FluentIterable concat( final Iterable> inputs) { checkNotNull(inputs); @@ -319,7 +312,6 @@ public Iterator get(int i) { * * @since 20.0 */ - @Beta public static FluentIterable of() { return FluentIterable.from(Collections.emptyList()); } @@ -332,7 +324,6 @@ public Iterator get(int i) { * * @since 20.0 */ - @Beta public static FluentIterable of( @ParametricNullness E element, E... elements) { return from(Lists.asList(element, elements)); @@ -401,7 +392,6 @@ public final FluentIterable cycle() { * * @since 18.0 */ - @Beta public final FluentIterable append(Iterable other) { return FluentIterable.concat(getDelegate(), other); } @@ -414,7 +404,6 @@ public final FluentIterable append(Iterable other) { * * @since 18.0 */ - @Beta public final FluentIterable append(E... elements) { return FluentIterable.concat(getDelegate(), Arrays.asList(elements)); } @@ -835,7 +824,6 @@ public final > C copyInto(C collection) { * * @since 18.0 */ - @Beta public final String join(Joiner joiner) { return joiner.join(this); } diff --git a/guava/src/com/google/common/collect/FluentIterable.java b/guava/src/com/google/common/collect/FluentIterable.java index 727488119f79..cd664228cffa 100644 --- a/guava/src/com/google/common/collect/FluentIterable.java +++ b/guava/src/com/google/common/collect/FluentIterable.java @@ -16,7 +16,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.base.Function; @@ -160,7 +159,6 @@ public Iterator iterator() { * * @since 20.0 (since 18.0 as an overload of {@code of}) */ - @Beta public static FluentIterable from(E[] elements) { return from(Arrays.asList(elements)); } @@ -193,7 +191,6 @@ public Iterator iterator() { * * @since 20.0 */ - @Beta public static FluentIterable concat( Iterable a, Iterable b) { return concatNoDefensiveCopy(a, b); @@ -212,7 +209,6 @@ public Iterator iterator() { * * @since 20.0 */ - @Beta public static FluentIterable concat( Iterable a, Iterable b, Iterable c) { return concatNoDefensiveCopy(a, b, c); @@ -232,7 +228,6 @@ public Iterator iterator() { * * @since 20.0 */ - @Beta public static FluentIterable concat( Iterable a, Iterable b, @@ -256,7 +251,6 @@ public Iterator iterator() { * @throws NullPointerException if any of the provided iterables is {@code null} * @since 20.0 */ - @Beta public static FluentIterable concat( Iterable... inputs) { return concatNoDefensiveCopy(Arrays.copyOf(inputs, inputs.length)); @@ -276,7 +270,6 @@ public Iterator iterator() { * * @since 20.0 */ - @Beta public static FluentIterable concat( final Iterable> inputs) { checkNotNull(inputs); @@ -316,7 +309,6 @@ public Iterator get(int i) { * * @since 20.0 */ - @Beta public static FluentIterable of() { return FluentIterable.from(Collections.emptyList()); } @@ -329,7 +321,6 @@ public Iterator get(int i) { * * @since 20.0 */ - @Beta public static FluentIterable of( @ParametricNullness E element, E... elements) { return from(Lists.asList(element, elements)); @@ -398,7 +389,6 @@ public final FluentIterable cycle() { * * @since 18.0 */ - @Beta public final FluentIterable append(Iterable other) { return FluentIterable.concat(getDelegate(), other); } @@ -411,7 +401,6 @@ public final FluentIterable append(Iterable other) { * * @since 18.0 */ - @Beta public final FluentIterable append(E... elements) { return FluentIterable.concat(getDelegate(), Arrays.asList(elements)); } @@ -827,7 +816,6 @@ public final > C copyInto(C collection) { * * @since 18.0 */ - @Beta public final String join(Joiner joiner) { return joiner.join(this); }