Skip to content

Commit 73b2f7b

Browse files
klueverGoogle Java Core Libraries
authored and
Google Java Core Libraries
committedApr 10, 2023
Remove @Beta from FluentIterable APIs.
Fixes #3426 and #3425 RELNOTES=`collect`: Remove `@Beta` from `FluentIterable` APIs. PiperOrigin-RevId: 523202674
1 parent fe12c81 commit 73b2f7b

File tree

2 files changed

+0
-24
lines changed

2 files changed

+0
-24
lines changed
 

‎android/guava/src/com/google/common/collect/FluentIterable.java

-12
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import static com.google.common.base.Preconditions.checkNotNull;
1818

19-
import com.google.common.annotations.Beta;
2019
import com.google.common.annotations.GwtCompatible;
2120
import com.google.common.annotations.GwtIncompatible;
2221
import com.google.common.base.Function;
@@ -163,7 +162,6 @@ public Iterator<E> iterator() {
163162
*
164163
* @since 20.0 (since 18.0 as an overload of {@code of})
165164
*/
166-
@Beta
167165
public static <E extends @Nullable Object> FluentIterable<E> from(E[] elements) {
168166
return from(Arrays.asList(elements));
169167
}
@@ -196,7 +194,6 @@ public Iterator<E> iterator() {
196194
*
197195
* @since 20.0
198196
*/
199-
@Beta
200197
public static <T extends @Nullable Object> FluentIterable<T> concat(
201198
Iterable<? extends T> a, Iterable<? extends T> b) {
202199
return concatNoDefensiveCopy(a, b);
@@ -215,7 +212,6 @@ public Iterator<E> iterator() {
215212
*
216213
* @since 20.0
217214
*/
218-
@Beta
219215
public static <T extends @Nullable Object> FluentIterable<T> concat(
220216
Iterable<? extends T> a, Iterable<? extends T> b, Iterable<? extends T> c) {
221217
return concatNoDefensiveCopy(a, b, c);
@@ -235,7 +231,6 @@ public Iterator<E> iterator() {
235231
*
236232
* @since 20.0
237233
*/
238-
@Beta
239234
public static <T extends @Nullable Object> FluentIterable<T> concat(
240235
Iterable<? extends T> a,
241236
Iterable<? extends T> b,
@@ -259,7 +254,6 @@ public Iterator<E> iterator() {
259254
* @throws NullPointerException if any of the provided iterables is {@code null}
260255
* @since 20.0
261256
*/
262-
@Beta
263257
public static <T extends @Nullable Object> FluentIterable<T> concat(
264258
Iterable<? extends T>... inputs) {
265259
return concatNoDefensiveCopy(Arrays.copyOf(inputs, inputs.length));
@@ -279,7 +273,6 @@ public Iterator<E> iterator() {
279273
*
280274
* @since 20.0
281275
*/
282-
@Beta
283276
public static <T extends @Nullable Object> FluentIterable<T> concat(
284277
final Iterable<? extends Iterable<? extends T>> inputs) {
285278
checkNotNull(inputs);
@@ -319,7 +312,6 @@ public Iterator<? extends T> get(int i) {
319312
*
320313
* @since 20.0
321314
*/
322-
@Beta
323315
public static <E extends @Nullable Object> FluentIterable<E> of() {
324316
return FluentIterable.from(Collections.<E>emptyList());
325317
}
@@ -332,7 +324,6 @@ public Iterator<? extends T> get(int i) {
332324
*
333325
* @since 20.0
334326
*/
335-
@Beta
336327
public static <E extends @Nullable Object> FluentIterable<E> of(
337328
@ParametricNullness E element, E... elements) {
338329
return from(Lists.asList(element, elements));
@@ -401,7 +392,6 @@ public final FluentIterable<E> cycle() {
401392
*
402393
* @since 18.0
403394
*/
404-
@Beta
405395
public final FluentIterable<E> append(Iterable<? extends E> other) {
406396
return FluentIterable.concat(getDelegate(), other);
407397
}
@@ -414,7 +404,6 @@ public final FluentIterable<E> append(Iterable<? extends E> other) {
414404
*
415405
* @since 18.0
416406
*/
417-
@Beta
418407
public final FluentIterable<E> append(E... elements) {
419408
return FluentIterable.concat(getDelegate(), Arrays.asList(elements));
420409
}
@@ -835,7 +824,6 @@ public final <C extends Collection<? super E>> C copyInto(C collection) {
835824
*
836825
* @since 18.0
837826
*/
838-
@Beta
839827
public final String join(Joiner joiner) {
840828
return joiner.join(this);
841829
}

‎guava/src/com/google/common/collect/FluentIterable.java

-12
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import static com.google.common.base.Preconditions.checkNotNull;
1818

19-
import com.google.common.annotations.Beta;
2019
import com.google.common.annotations.GwtCompatible;
2120
import com.google.common.annotations.GwtIncompatible;
2221
import com.google.common.base.Function;
@@ -160,7 +159,6 @@ public Iterator<E> iterator() {
160159
*
161160
* @since 20.0 (since 18.0 as an overload of {@code of})
162161
*/
163-
@Beta
164162
public static <E extends @Nullable Object> FluentIterable<E> from(E[] elements) {
165163
return from(Arrays.asList(elements));
166164
}
@@ -193,7 +191,6 @@ public Iterator<E> iterator() {
193191
*
194192
* @since 20.0
195193
*/
196-
@Beta
197194
public static <T extends @Nullable Object> FluentIterable<T> concat(
198195
Iterable<? extends T> a, Iterable<? extends T> b) {
199196
return concatNoDefensiveCopy(a, b);
@@ -212,7 +209,6 @@ public Iterator<E> iterator() {
212209
*
213210
* @since 20.0
214211
*/
215-
@Beta
216212
public static <T extends @Nullable Object> FluentIterable<T> concat(
217213
Iterable<? extends T> a, Iterable<? extends T> b, Iterable<? extends T> c) {
218214
return concatNoDefensiveCopy(a, b, c);
@@ -232,7 +228,6 @@ public Iterator<E> iterator() {
232228
*
233229
* @since 20.0
234230
*/
235-
@Beta
236231
public static <T extends @Nullable Object> FluentIterable<T> concat(
237232
Iterable<? extends T> a,
238233
Iterable<? extends T> b,
@@ -256,7 +251,6 @@ public Iterator<E> iterator() {
256251
* @throws NullPointerException if any of the provided iterables is {@code null}
257252
* @since 20.0
258253
*/
259-
@Beta
260254
public static <T extends @Nullable Object> FluentIterable<T> concat(
261255
Iterable<? extends T>... inputs) {
262256
return concatNoDefensiveCopy(Arrays.copyOf(inputs, inputs.length));
@@ -276,7 +270,6 @@ public Iterator<E> iterator() {
276270
*
277271
* @since 20.0
278272
*/
279-
@Beta
280273
public static <T extends @Nullable Object> FluentIterable<T> concat(
281274
final Iterable<? extends Iterable<? extends T>> inputs) {
282275
checkNotNull(inputs);
@@ -316,7 +309,6 @@ public Iterator<? extends T> get(int i) {
316309
*
317310
* @since 20.0
318311
*/
319-
@Beta
320312
public static <E extends @Nullable Object> FluentIterable<E> of() {
321313
return FluentIterable.from(Collections.<E>emptyList());
322314
}
@@ -329,7 +321,6 @@ public Iterator<? extends T> get(int i) {
329321
*
330322
* @since 20.0
331323
*/
332-
@Beta
333324
public static <E extends @Nullable Object> FluentIterable<E> of(
334325
@ParametricNullness E element, E... elements) {
335326
return from(Lists.asList(element, elements));
@@ -398,7 +389,6 @@ public final FluentIterable<E> cycle() {
398389
*
399390
* @since 18.0
400391
*/
401-
@Beta
402392
public final FluentIterable<E> append(Iterable<? extends E> other) {
403393
return FluentIterable.concat(getDelegate(), other);
404394
}
@@ -411,7 +401,6 @@ public final FluentIterable<E> append(Iterable<? extends E> other) {
411401
*
412402
* @since 18.0
413403
*/
414-
@Beta
415404
public final FluentIterable<E> append(E... elements) {
416405
return FluentIterable.concat(getDelegate(), Arrays.asList(elements));
417406
}
@@ -827,7 +816,6 @@ public final <C extends Collection<? super E>> C copyInto(C collection) {
827816
*
828817
* @since 18.0
829818
*/
830-
@Beta
831819
public final String join(Joiner joiner) {
832820
return joiner.join(this);
833821
}

0 commit comments

Comments
 (0)
Please sign in to comment.