Skip to content

Commit b0cc461

Browse files
klueverGoogle Java Core Libraries
kluever
authored and
Google Java Core Libraries
committedMay 1, 2023
Remove @Beta from com.google.common.base APIs.
RELNOTES=`base`: Remove `@Beta` from `com.google.common.base` APIs. PiperOrigin-RevId: 528547846
·
v33.4.5failureaccess-v1.0.2
1 parent 3b2ad2e commit b0cc461

File tree

10 files changed

+0
-39
lines changed

10 files changed

+0
-39
lines changed
 

‎android/guava/src/com/google/common/base/FunctionalEquivalence.java

-2
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 java.io.Serializable;
2221
import javax.annotation.CheckForNull;
@@ -28,7 +27,6 @@
2827
* @author Bob Lee
2928
* @since 10.0
3029
*/
31-
@Beta
3230
@GwtCompatible
3331
@ElementTypesAreNonnullByDefault
3432
final class FunctionalEquivalence<F, T> extends Equivalence<F> implements Serializable {

‎android/guava/src/com/google/common/base/Joiner.java

-7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import static com.google.common.base.Preconditions.checkNotNull;
1818
import static java.util.Objects.requireNonNull;
1919

20-
import com.google.common.annotations.Beta;
2120
import com.google.common.annotations.GwtCompatible;
2221
import com.google.errorprone.annotations.CanIgnoreReturnValue;
2322
import java.io.IOException;
@@ -366,7 +365,6 @@ public StringBuilder appendTo(StringBuilder builder, Map<?, ?> map) {
366365
*
367366
* @since 10.0
368367
*/
369-
@Beta
370368
@CanIgnoreReturnValue
371369
public <A extends Appendable> A appendTo(A appendable, Iterable<? extends Entry<?, ?>> entries)
372370
throws IOException {
@@ -379,7 +377,6 @@ public <A extends Appendable> A appendTo(A appendable, Iterable<? extends Entry<
379377
*
380378
* @since 11.0
381379
*/
382-
@Beta
383380
@CanIgnoreReturnValue
384381
public <A extends Appendable> A appendTo(A appendable, Iterator<? extends Entry<?, ?>> parts)
385382
throws IOException {
@@ -407,7 +404,6 @@ public <A extends Appendable> A appendTo(A appendable, Iterator<? extends Entry<
407404
*
408405
* @since 10.0
409406
*/
410-
@Beta
411407
@CanIgnoreReturnValue
412408
public StringBuilder appendTo(StringBuilder builder, Iterable<? extends Entry<?, ?>> entries) {
413409
return appendTo(builder, entries.iterator());
@@ -420,7 +416,6 @@ public StringBuilder appendTo(StringBuilder builder, Iterable<? extends Entry<?,
420416
*
421417
* @since 11.0
422418
*/
423-
@Beta
424419
@CanIgnoreReturnValue
425420
public StringBuilder appendTo(StringBuilder builder, Iterator<? extends Entry<?, ?>> entries) {
426421
try {
@@ -445,7 +440,6 @@ public String join(Map<?, ?> map) {
445440
*
446441
* @since 10.0
447442
*/
448-
@Beta
449443
public String join(Iterable<? extends Entry<?, ?>> entries) {
450444
return join(entries.iterator());
451445
}
@@ -456,7 +450,6 @@ public String join(Iterable<? extends Entry<?, ?>> entries) {
456450
*
457451
* @since 11.0
458452
*/
459-
@Beta
460453
public String join(Iterator<? extends Entry<?, ?>> entries) {
461454
return appendTo(new StringBuilder(), entries).toString();
462455
}

‎android/guava/src/com/google/common/base/Optional.java

-3
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.errorprone.annotations.DoNotMock;
2221
import java.io.Serializable;
@@ -200,7 +199,6 @@ public static <T> Optional<T> fromNullable(@CheckForNull T nullableReference) {
200199
* @throws NullPointerException if this optional's value is absent and the supplier returns {@code
201200
* null}
202201
*/
203-
@Beta
204202
public abstract T or(Supplier<? extends T> supplier);
205203

206204
/**
@@ -292,7 +290,6 @@ public static <T> Optional<T> fromNullable(@CheckForNull T nullableReference) {
292290
*
293291
* @since 11.0 (generics widened in 13.0)
294292
*/
295-
@Beta
296293
public static <T> Iterable<T> presentInstances(
297294
final Iterable<? extends Optional<? extends T>> optionals) {
298295
checkNotNull(optionals);

‎android/guava/src/com/google/common/base/Predicates.java

-2
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.annotations.J2ktIncompatible;
@@ -198,7 +197,6 @@ private Predicates() {}
198197
*/
199198
@J2ktIncompatible
200199
@GwtIncompatible // Class.isAssignableFrom
201-
@Beta
202200
public static Predicate<Class<?>> subtypeOf(Class<?> clazz) {
203201
return new SubtypeOfPredicate(clazz);
204202
}

‎android/guava/src/com/google/common/base/Splitter.java

-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import static com.google.common.base.Preconditions.checkArgument;
1818
import static com.google.common.base.Preconditions.checkNotNull;
1919

20-
import com.google.common.annotations.Beta;
2120
import com.google.common.annotations.GwtCompatible;
2221
import com.google.common.annotations.GwtIncompatible;
2322
import com.google.common.annotations.J2ktIncompatible;
@@ -432,7 +431,6 @@ public List<String> splitToList(CharSequence sequence) {
432431
*
433432
* @since 10.0
434433
*/
435-
@Beta
436434
public MapSplitter withKeyValueSeparator(String separator) {
437435
return withKeyValueSeparator(on(separator));
438436
}
@@ -443,7 +441,6 @@ public MapSplitter withKeyValueSeparator(String separator) {
443441
*
444442
* @since 14.0
445443
*/
446-
@Beta
447444
public MapSplitter withKeyValueSeparator(char separator) {
448445
return withKeyValueSeparator(on(separator));
449446
}
@@ -467,7 +464,6 @@ public MapSplitter withKeyValueSeparator(char separator) {
467464
*
468465
* @since 10.0
469466
*/
470-
@Beta
471467
public MapSplitter withKeyValueSeparator(Splitter keyValueSplitter) {
472468
return new MapSplitter(this, keyValueSplitter);
473469
}
@@ -480,7 +476,6 @@ public MapSplitter withKeyValueSeparator(Splitter keyValueSplitter) {
480476
*
481477
* @since 10.0
482478
*/
483-
@Beta
484479
public static final class MapSplitter {
485480
private static final String INVALID_ENTRY_MESSAGE = "Chunk [%s] is not a valid entry";
486481
private final Splitter outerSplitter;

‎guava/src/com/google/common/base/FunctionalEquivalence.java

-2
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 java.io.Serializable;
2221
import javax.annotation.CheckForNull;
@@ -28,7 +27,6 @@
2827
* @author Bob Lee
2928
* @since 10.0
3029
*/
31-
@Beta
3230
@GwtCompatible
3331
@ElementTypesAreNonnullByDefault
3432
final class FunctionalEquivalence<F, T> extends Equivalence<F> implements Serializable {

‎guava/src/com/google/common/base/Joiner.java

-7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import static com.google.common.base.Preconditions.checkNotNull;
1818
import static java.util.Objects.requireNonNull;
1919

20-
import com.google.common.annotations.Beta;
2120
import com.google.common.annotations.GwtCompatible;
2221
import com.google.errorprone.annotations.CanIgnoreReturnValue;
2322
import java.io.IOException;
@@ -366,7 +365,6 @@ public StringBuilder appendTo(StringBuilder builder, Map<?, ?> map) {
366365
*
367366
* @since 10.0
368367
*/
369-
@Beta
370368
@CanIgnoreReturnValue
371369
public <A extends Appendable> A appendTo(A appendable, Iterable<? extends Entry<?, ?>> entries)
372370
throws IOException {
@@ -379,7 +377,6 @@ public <A extends Appendable> A appendTo(A appendable, Iterable<? extends Entry<
379377
*
380378
* @since 11.0
381379
*/
382-
@Beta
383380
@CanIgnoreReturnValue
384381
public <A extends Appendable> A appendTo(A appendable, Iterator<? extends Entry<?, ?>> parts)
385382
throws IOException {
@@ -407,7 +404,6 @@ public <A extends Appendable> A appendTo(A appendable, Iterator<? extends Entry<
407404
*
408405
* @since 10.0
409406
*/
410-
@Beta
411407
@CanIgnoreReturnValue
412408
public StringBuilder appendTo(StringBuilder builder, Iterable<? extends Entry<?, ?>> entries) {
413409
return appendTo(builder, entries.iterator());
@@ -420,7 +416,6 @@ public StringBuilder appendTo(StringBuilder builder, Iterable<? extends Entry<?,
420416
*
421417
* @since 11.0
422418
*/
423-
@Beta
424419
@CanIgnoreReturnValue
425420
public StringBuilder appendTo(StringBuilder builder, Iterator<? extends Entry<?, ?>> entries) {
426421
try {
@@ -445,7 +440,6 @@ public String join(Map<?, ?> map) {
445440
*
446441
* @since 10.0
447442
*/
448-
@Beta
449443
public String join(Iterable<? extends Entry<?, ?>> entries) {
450444
return join(entries.iterator());
451445
}
@@ -456,7 +450,6 @@ public String join(Iterable<? extends Entry<?, ?>> entries) {
456450
*
457451
* @since 11.0
458452
*/
459-
@Beta
460453
public String join(Iterator<? extends Entry<?, ?>> entries) {
461454
return appendTo(new StringBuilder(), entries).toString();
462455
}

‎guava/src/com/google/common/base/Optional.java

-3
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.errorprone.annotations.DoNotMock;
2221
import java.io.Serializable;
@@ -242,7 +241,6 @@ public java.util.Optional<T> toJavaUtil() {
242241
* @throws NullPointerException if this optional's value is absent and the supplier returns {@code
243242
* null}
244243
*/
245-
@Beta
246244
public abstract T or(Supplier<? extends T> supplier);
247245

248246
/**
@@ -334,7 +332,6 @@ public java.util.Optional<T> toJavaUtil() {
334332
*
335333
* @since 11.0 (generics widened in 13.0)
336334
*/
337-
@Beta
338335
public static <T> Iterable<T> presentInstances(
339336
final Iterable<? extends Optional<? extends T>> optionals) {
340337
checkNotNull(optionals);

‎guava/src/com/google/common/base/Predicates.java

-2
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.annotations.J2ktIncompatible;
@@ -198,7 +197,6 @@ private Predicates() {}
198197
*/
199198
@J2ktIncompatible
200199
@GwtIncompatible // Class.isAssignableFrom
201-
@Beta
202200
public static Predicate<Class<?>> subtypeOf(Class<?> clazz) {
203201
return new SubtypeOfPredicate(clazz);
204202
}

‎guava/src/com/google/common/base/Splitter.java

-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import static com.google.common.base.Preconditions.checkArgument;
1818
import static com.google.common.base.Preconditions.checkNotNull;
1919

20-
import com.google.common.annotations.Beta;
2120
import com.google.common.annotations.GwtCompatible;
2221
import com.google.common.annotations.GwtIncompatible;
2322
import com.google.common.annotations.J2ktIncompatible;
@@ -437,7 +436,6 @@ public List<String> splitToList(CharSequence sequence) {
437436
* @return a stream over the segments split from the parameter
438437
* @since 28.2
439438
*/
440-
@Beta
441439
public Stream<String> splitToStream(CharSequence sequence) {
442440
// Can't use Streams.stream() from base
443441
return StreamSupport.stream(split(sequence).spliterator(), false);
@@ -449,7 +447,6 @@ public Stream<String> splitToStream(CharSequence sequence) {
449447
*
450448
* @since 10.0
451449
*/
452-
@Beta
453450
public MapSplitter withKeyValueSeparator(String separator) {
454451
return withKeyValueSeparator(on(separator));
455452
}
@@ -460,7 +457,6 @@ public MapSplitter withKeyValueSeparator(String separator) {
460457
*
461458
* @since 14.0
462459
*/
463-
@Beta
464460
public MapSplitter withKeyValueSeparator(char separator) {
465461
return withKeyValueSeparator(on(separator));
466462
}
@@ -484,7 +480,6 @@ public MapSplitter withKeyValueSeparator(char separator) {
484480
*
485481
* @since 10.0
486482
*/
487-
@Beta
488483
public MapSplitter withKeyValueSeparator(Splitter keyValueSplitter) {
489484
return new MapSplitter(this, keyValueSplitter);
490485
}
@@ -497,7 +492,6 @@ public MapSplitter withKeyValueSeparator(Splitter keyValueSplitter) {
497492
*
498493
* @since 10.0
499494
*/
500-
@Beta
501495
public static final class MapSplitter {
502496
private static final String INVALID_ENTRY_MESSAGE = "Chunk [%s] is not a valid entry";
503497
private final Splitter outerSplitter;

0 commit comments

Comments
 (0)
Please sign in to comment.