Skip to content

Commit

Permalink
Remove @Beta from com.google.common.base APIs.
Browse files Browse the repository at this point in the history
RELNOTES=`base`: Remove `@Beta` from `com.google.common.base` APIs.
PiperOrigin-RevId: 528547846
  • Loading branch information
kluever authored and Google Java Core Libraries committed May 1, 2023
1 parent 3b2ad2e commit b0cc461
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 39 deletions.
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 java.io.Serializable;
import javax.annotation.CheckForNull;
Expand All @@ -28,7 +27,6 @@
* @author Bob Lee
* @since 10.0
*/
@Beta
@GwtCompatible
@ElementTypesAreNonnullByDefault
final class FunctionalEquivalence<F, T> extends Equivalence<F> implements Serializable {
Expand Down
7 changes: 0 additions & 7 deletions android/guava/src/com/google/common/base/Joiner.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static java.util.Objects.requireNonNull;

import com.google.common.annotations.Beta;
import com.google.common.annotations.GwtCompatible;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import java.io.IOException;
Expand Down Expand Up @@ -366,7 +365,6 @@ public StringBuilder appendTo(StringBuilder builder, Map<?, ?> map) {
*
* @since 10.0
*/
@Beta
@CanIgnoreReturnValue
public <A extends Appendable> A appendTo(A appendable, Iterable<? extends Entry<?, ?>> entries)
throws IOException {
Expand All @@ -379,7 +377,6 @@ public <A extends Appendable> A appendTo(A appendable, Iterable<? extends Entry<
*
* @since 11.0
*/
@Beta
@CanIgnoreReturnValue
public <A extends Appendable> A appendTo(A appendable, Iterator<? extends Entry<?, ?>> parts)
throws IOException {
Expand Down Expand Up @@ -407,7 +404,6 @@ public <A extends Appendable> A appendTo(A appendable, Iterator<? extends Entry<
*
* @since 10.0
*/
@Beta
@CanIgnoreReturnValue
public StringBuilder appendTo(StringBuilder builder, Iterable<? extends Entry<?, ?>> entries) {
return appendTo(builder, entries.iterator());
Expand All @@ -420,7 +416,6 @@ public StringBuilder appendTo(StringBuilder builder, Iterable<? extends Entry<?,
*
* @since 11.0
*/
@Beta
@CanIgnoreReturnValue
public StringBuilder appendTo(StringBuilder builder, Iterator<? extends Entry<?, ?>> entries) {
try {
Expand All @@ -445,7 +440,6 @@ public String join(Map<?, ?> map) {
*
* @since 10.0
*/
@Beta
public String join(Iterable<? extends Entry<?, ?>> entries) {
return join(entries.iterator());
}
Expand All @@ -456,7 +450,6 @@ public String join(Iterable<? extends Entry<?, ?>> entries) {
*
* @since 11.0
*/
@Beta
public String join(Iterator<? extends Entry<?, ?>> entries) {
return appendTo(new StringBuilder(), entries).toString();
}
Expand Down
3 changes: 0 additions & 3 deletions android/guava/src/com/google/common/base/Optional.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.errorprone.annotations.DoNotMock;
import java.io.Serializable;
Expand Down Expand Up @@ -200,7 +199,6 @@ public static <T> Optional<T> fromNullable(@CheckForNull T nullableReference) {
* @throws NullPointerException if this optional's value is absent and the supplier returns {@code
* null}
*/
@Beta
public abstract T or(Supplier<? extends T> supplier);

/**
Expand Down Expand Up @@ -292,7 +290,6 @@ public static <T> Optional<T> fromNullable(@CheckForNull T nullableReference) {
*
* @since 11.0 (generics widened in 13.0)
*/
@Beta
public static <T> Iterable<T> presentInstances(
final Iterable<? extends Optional<? extends T>> optionals) {
checkNotNull(optionals);
Expand Down
2 changes: 0 additions & 2 deletions android/guava/src/com/google/common/base/Predicates.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.annotations.J2ktIncompatible;
Expand Down Expand Up @@ -198,7 +197,6 @@ private Predicates() {}
*/
@J2ktIncompatible
@GwtIncompatible // Class.isAssignableFrom
@Beta
public static Predicate<Class<?>> subtypeOf(Class<?> clazz) {
return new SubtypeOfPredicate(clazz);
}
Expand Down
5 changes: 0 additions & 5 deletions android/guava/src/com/google/common/base/Splitter.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import static com.google.common.base.Preconditions.checkArgument;
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.annotations.J2ktIncompatible;
Expand Down Expand Up @@ -432,7 +431,6 @@ public List<String> splitToList(CharSequence sequence) {
*
* @since 10.0
*/
@Beta
public MapSplitter withKeyValueSeparator(String separator) {
return withKeyValueSeparator(on(separator));
}
Expand All @@ -443,7 +441,6 @@ public MapSplitter withKeyValueSeparator(String separator) {
*
* @since 14.0
*/
@Beta
public MapSplitter withKeyValueSeparator(char separator) {
return withKeyValueSeparator(on(separator));
}
Expand All @@ -467,7 +464,6 @@ public MapSplitter withKeyValueSeparator(char separator) {
*
* @since 10.0
*/
@Beta
public MapSplitter withKeyValueSeparator(Splitter keyValueSplitter) {
return new MapSplitter(this, keyValueSplitter);
}
Expand All @@ -480,7 +476,6 @@ public MapSplitter withKeyValueSeparator(Splitter keyValueSplitter) {
*
* @since 10.0
*/
@Beta
public static final class MapSplitter {
private static final String INVALID_ENTRY_MESSAGE = "Chunk [%s] is not a valid entry";
private final Splitter outerSplitter;
Expand Down
2 changes: 0 additions & 2 deletions guava/src/com/google/common/base/FunctionalEquivalence.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 java.io.Serializable;
import javax.annotation.CheckForNull;
Expand All @@ -28,7 +27,6 @@
* @author Bob Lee
* @since 10.0
*/
@Beta
@GwtCompatible
@ElementTypesAreNonnullByDefault
final class FunctionalEquivalence<F, T> extends Equivalence<F> implements Serializable {
Expand Down
7 changes: 0 additions & 7 deletions guava/src/com/google/common/base/Joiner.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static java.util.Objects.requireNonNull;

import com.google.common.annotations.Beta;
import com.google.common.annotations.GwtCompatible;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import java.io.IOException;
Expand Down Expand Up @@ -366,7 +365,6 @@ public StringBuilder appendTo(StringBuilder builder, Map<?, ?> map) {
*
* @since 10.0
*/
@Beta
@CanIgnoreReturnValue
public <A extends Appendable> A appendTo(A appendable, Iterable<? extends Entry<?, ?>> entries)
throws IOException {
Expand All @@ -379,7 +377,6 @@ public <A extends Appendable> A appendTo(A appendable, Iterable<? extends Entry<
*
* @since 11.0
*/
@Beta
@CanIgnoreReturnValue
public <A extends Appendable> A appendTo(A appendable, Iterator<? extends Entry<?, ?>> parts)
throws IOException {
Expand Down Expand Up @@ -407,7 +404,6 @@ public <A extends Appendable> A appendTo(A appendable, Iterator<? extends Entry<
*
* @since 10.0
*/
@Beta
@CanIgnoreReturnValue
public StringBuilder appendTo(StringBuilder builder, Iterable<? extends Entry<?, ?>> entries) {
return appendTo(builder, entries.iterator());
Expand All @@ -420,7 +416,6 @@ public StringBuilder appendTo(StringBuilder builder, Iterable<? extends Entry<?,
*
* @since 11.0
*/
@Beta
@CanIgnoreReturnValue
public StringBuilder appendTo(StringBuilder builder, Iterator<? extends Entry<?, ?>> entries) {
try {
Expand All @@ -445,7 +440,6 @@ public String join(Map<?, ?> map) {
*
* @since 10.0
*/
@Beta
public String join(Iterable<? extends Entry<?, ?>> entries) {
return join(entries.iterator());
}
Expand All @@ -456,7 +450,6 @@ public String join(Iterable<? extends Entry<?, ?>> entries) {
*
* @since 11.0
*/
@Beta
public String join(Iterator<? extends Entry<?, ?>> entries) {
return appendTo(new StringBuilder(), entries).toString();
}
Expand Down
3 changes: 0 additions & 3 deletions guava/src/com/google/common/base/Optional.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.errorprone.annotations.DoNotMock;
import java.io.Serializable;
Expand Down Expand Up @@ -242,7 +241,6 @@ public java.util.Optional<T> toJavaUtil() {
* @throws NullPointerException if this optional's value is absent and the supplier returns {@code
* null}
*/
@Beta
public abstract T or(Supplier<? extends T> supplier);

/**
Expand Down Expand Up @@ -334,7 +332,6 @@ public java.util.Optional<T> toJavaUtil() {
*
* @since 11.0 (generics widened in 13.0)
*/
@Beta
public static <T> Iterable<T> presentInstances(
final Iterable<? extends Optional<? extends T>> optionals) {
checkNotNull(optionals);
Expand Down
2 changes: 0 additions & 2 deletions guava/src/com/google/common/base/Predicates.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.annotations.J2ktIncompatible;
Expand Down Expand Up @@ -198,7 +197,6 @@ private Predicates() {}
*/
@J2ktIncompatible
@GwtIncompatible // Class.isAssignableFrom
@Beta
public static Predicate<Class<?>> subtypeOf(Class<?> clazz) {
return new SubtypeOfPredicate(clazz);
}
Expand Down
6 changes: 0 additions & 6 deletions guava/src/com/google/common/base/Splitter.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import static com.google.common.base.Preconditions.checkArgument;
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.annotations.J2ktIncompatible;
Expand Down Expand Up @@ -437,7 +436,6 @@ public List<String> splitToList(CharSequence sequence) {
* @return a stream over the segments split from the parameter
* @since 28.2
*/
@Beta
public Stream<String> splitToStream(CharSequence sequence) {
// Can't use Streams.stream() from base
return StreamSupport.stream(split(sequence).spliterator(), false);
Expand All @@ -449,7 +447,6 @@ public Stream<String> splitToStream(CharSequence sequence) {
*
* @since 10.0
*/
@Beta
public MapSplitter withKeyValueSeparator(String separator) {
return withKeyValueSeparator(on(separator));
}
Expand All @@ -460,7 +457,6 @@ public MapSplitter withKeyValueSeparator(String separator) {
*
* @since 14.0
*/
@Beta
public MapSplitter withKeyValueSeparator(char separator) {
return withKeyValueSeparator(on(separator));
}
Expand All @@ -484,7 +480,6 @@ public MapSplitter withKeyValueSeparator(char separator) {
*
* @since 10.0
*/
@Beta
public MapSplitter withKeyValueSeparator(Splitter keyValueSplitter) {
return new MapSplitter(this, keyValueSplitter);
}
Expand All @@ -497,7 +492,6 @@ public MapSplitter withKeyValueSeparator(Splitter keyValueSplitter) {
*
* @since 10.0
*/
@Beta
public static final class MapSplitter {
private static final String INVALID_ENTRY_MESSAGE = "Chunk [%s] is not a valid entry";
private final Splitter outerSplitter;
Expand Down

0 comments on commit b0cc461

Please sign in to comment.