Skip to content

Commit

Permalink
Remove @Beta from FluentIterable APIs.
Browse files Browse the repository at this point in the history
Fixes #3426 and #3425

RELNOTES=`collect`: Remove `@Beta` from `FluentIterable` APIs.
PiperOrigin-RevId: 523202674
  • Loading branch information
kluever authored and Google Java Core Libraries committed Apr 10, 2023
1 parent fe12c81 commit 73b2f7b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 24 deletions.
12 changes: 0 additions & 12 deletions android/guava/src/com/google/common/collect/FluentIterable.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -163,7 +162,6 @@ public Iterator<E> iterator() {
*
* @since 20.0 (since 18.0 as an overload of {@code of})
*/
@Beta
public static <E extends @Nullable Object> FluentIterable<E> from(E[] elements) {
return from(Arrays.asList(elements));
}
Expand Down Expand Up @@ -196,7 +194,6 @@ public Iterator<E> iterator() {
*
* @since 20.0
*/
@Beta
public static <T extends @Nullable Object> FluentIterable<T> concat(
Iterable<? extends T> a, Iterable<? extends T> b) {
return concatNoDefensiveCopy(a, b);
Expand All @@ -215,7 +212,6 @@ public Iterator<E> iterator() {
*
* @since 20.0
*/
@Beta
public static <T extends @Nullable Object> FluentIterable<T> concat(
Iterable<? extends T> a, Iterable<? extends T> b, Iterable<? extends T> c) {
return concatNoDefensiveCopy(a, b, c);
Expand All @@ -235,7 +231,6 @@ public Iterator<E> iterator() {
*
* @since 20.0
*/
@Beta
public static <T extends @Nullable Object> FluentIterable<T> concat(
Iterable<? extends T> a,
Iterable<? extends T> b,
Expand All @@ -259,7 +254,6 @@ public Iterator<E> iterator() {
* @throws NullPointerException if any of the provided iterables is {@code null}
* @since 20.0
*/
@Beta
public static <T extends @Nullable Object> FluentIterable<T> concat(
Iterable<? extends T>... inputs) {
return concatNoDefensiveCopy(Arrays.copyOf(inputs, inputs.length));
Expand All @@ -279,7 +273,6 @@ public Iterator<E> iterator() {
*
* @since 20.0
*/
@Beta
public static <T extends @Nullable Object> FluentIterable<T> concat(
final Iterable<? extends Iterable<? extends T>> inputs) {
checkNotNull(inputs);
Expand Down Expand Up @@ -319,7 +312,6 @@ public Iterator<? extends T> get(int i) {
*
* @since 20.0
*/
@Beta
public static <E extends @Nullable Object> FluentIterable<E> of() {
return FluentIterable.from(Collections.<E>emptyList());
}
Expand All @@ -332,7 +324,6 @@ public Iterator<? extends T> get(int i) {
*
* @since 20.0
*/
@Beta
public static <E extends @Nullable Object> FluentIterable<E> of(
@ParametricNullness E element, E... elements) {
return from(Lists.asList(element, elements));
Expand Down Expand Up @@ -401,7 +392,6 @@ public final FluentIterable<E> cycle() {
*
* @since 18.0
*/
@Beta
public final FluentIterable<E> append(Iterable<? extends E> other) {
return FluentIterable.concat(getDelegate(), other);
}
Expand All @@ -414,7 +404,6 @@ public final FluentIterable<E> append(Iterable<? extends E> other) {
*
* @since 18.0
*/
@Beta
public final FluentIterable<E> append(E... elements) {
return FluentIterable.concat(getDelegate(), Arrays.asList(elements));
}
Expand Down Expand Up @@ -835,7 +824,6 @@ public final <C extends Collection<? super E>> C copyInto(C collection) {
*
* @since 18.0
*/
@Beta
public final String join(Joiner joiner) {
return joiner.join(this);
}
Expand Down
12 changes: 0 additions & 12 deletions guava/src/com/google/common/collect/FluentIterable.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -160,7 +159,6 @@ public Iterator<E> iterator() {
*
* @since 20.0 (since 18.0 as an overload of {@code of})
*/
@Beta
public static <E extends @Nullable Object> FluentIterable<E> from(E[] elements) {
return from(Arrays.asList(elements));
}
Expand Down Expand Up @@ -193,7 +191,6 @@ public Iterator<E> iterator() {
*
* @since 20.0
*/
@Beta
public static <T extends @Nullable Object> FluentIterable<T> concat(
Iterable<? extends T> a, Iterable<? extends T> b) {
return concatNoDefensiveCopy(a, b);
Expand All @@ -212,7 +209,6 @@ public Iterator<E> iterator() {
*
* @since 20.0
*/
@Beta
public static <T extends @Nullable Object> FluentIterable<T> concat(
Iterable<? extends T> a, Iterable<? extends T> b, Iterable<? extends T> c) {
return concatNoDefensiveCopy(a, b, c);
Expand All @@ -232,7 +228,6 @@ public Iterator<E> iterator() {
*
* @since 20.0
*/
@Beta
public static <T extends @Nullable Object> FluentIterable<T> concat(
Iterable<? extends T> a,
Iterable<? extends T> b,
Expand All @@ -256,7 +251,6 @@ public Iterator<E> iterator() {
* @throws NullPointerException if any of the provided iterables is {@code null}
* @since 20.0
*/
@Beta
public static <T extends @Nullable Object> FluentIterable<T> concat(
Iterable<? extends T>... inputs) {
return concatNoDefensiveCopy(Arrays.copyOf(inputs, inputs.length));
Expand All @@ -276,7 +270,6 @@ public Iterator<E> iterator() {
*
* @since 20.0
*/
@Beta
public static <T extends @Nullable Object> FluentIterable<T> concat(
final Iterable<? extends Iterable<? extends T>> inputs) {
checkNotNull(inputs);
Expand Down Expand Up @@ -316,7 +309,6 @@ public Iterator<? extends T> get(int i) {
*
* @since 20.0
*/
@Beta
public static <E extends @Nullable Object> FluentIterable<E> of() {
return FluentIterable.from(Collections.<E>emptyList());
}
Expand All @@ -329,7 +321,6 @@ public Iterator<? extends T> get(int i) {
*
* @since 20.0
*/
@Beta
public static <E extends @Nullable Object> FluentIterable<E> of(
@ParametricNullness E element, E... elements) {
return from(Lists.asList(element, elements));
Expand Down Expand Up @@ -398,7 +389,6 @@ public final FluentIterable<E> cycle() {
*
* @since 18.0
*/
@Beta
public final FluentIterable<E> append(Iterable<? extends E> other) {
return FluentIterable.concat(getDelegate(), other);
}
Expand All @@ -411,7 +401,6 @@ public final FluentIterable<E> append(Iterable<? extends E> other) {
*
* @since 18.0
*/
@Beta
public final FluentIterable<E> append(E... elements) {
return FluentIterable.concat(getDelegate(), Arrays.asList(elements));
}
Expand Down Expand Up @@ -827,7 +816,6 @@ public final <C extends Collection<? super E>> C copyInto(C collection) {
*
* @since 18.0
*/
@Beta
public final String join(Joiner joiner) {
return joiner.join(this);
}
Expand Down

0 comments on commit 73b2f7b

Please sign in to comment.