From a195f7d60444e3bf2e64c543a1900096ede2dfe1 Mon Sep 17 00:00:00 2001 From: Kurt Alfred Kluever Date: Mon, 10 Apr 2023 13:55:22 -0700 Subject: [PATCH] Remove `@Beta` from `Invokable` and some methods in `TypeToken`. Fixes https://github.com/google/guava/issues/3051 RELNOTES=`reflect`: Remove `@Beta` from `Invokable` and some methods in `TypeToken`. PiperOrigin-RevId: 523204476 --- android/guava/src/com/google/common/reflect/Invokable.java | 2 -- android/guava/src/com/google/common/reflect/TypeToken.java | 3 --- guava/src/com/google/common/reflect/Invokable.java | 2 -- guava/src/com/google/common/reflect/TypeToken.java | 3 --- 4 files changed, 10 deletions(-) diff --git a/android/guava/src/com/google/common/reflect/Invokable.java b/android/guava/src/com/google/common/reflect/Invokable.java index b04fd33b0744..9ae95c92ac8c 100644 --- a/android/guava/src/com/google/common/reflect/Invokable.java +++ b/android/guava/src/com/google/common/reflect/Invokable.java @@ -16,7 +16,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.DoNotCall; @@ -64,7 +63,6 @@ * @since 14.0 (no longer implements {@link AccessibleObject} or {@code GenericDeclaration} since * 31.0) */ -@Beta @ElementTypesAreNonnullByDefault public abstract class Invokable implements AnnotatedElement, Member { private final AccessibleObject accessibleObject; diff --git a/android/guava/src/com/google/common/reflect/TypeToken.java b/android/guava/src/com/google/common/reflect/TypeToken.java index 1ec9e28506cb..8abec1a57cab 100644 --- a/android/guava/src/com/google/common/reflect/TypeToken.java +++ b/android/guava/src/com/google/common/reflect/TypeToken.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.base.Predicate; @@ -590,7 +589,6 @@ public final TypeToken getComponentType() { * * @since 14.0 */ - @Beta public final Invokable method(Method method) { checkArgument( this.someRawTypeIsSubclassOf(method.getDeclaringClass()), @@ -630,7 +628,6 @@ public String toString() { * * @since 14.0 */ - @Beta public final Invokable constructor(Constructor constructor) { checkArgument( constructor.getDeclaringClass() == getRawType(), diff --git a/guava/src/com/google/common/reflect/Invokable.java b/guava/src/com/google/common/reflect/Invokable.java index 60cfca59ffbf..20c774a7c6ef 100644 --- a/guava/src/com/google/common/reflect/Invokable.java +++ b/guava/src/com/google/common/reflect/Invokable.java @@ -16,7 +16,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.lang.annotation.Annotation; @@ -63,7 +62,6 @@ * @since 14.0 (no longer implements {@link AccessibleObject} or {@code GenericDeclaration} since * 31.0) */ -@Beta @ElementTypesAreNonnullByDefault public abstract class Invokable implements AnnotatedElement, Member { private final AccessibleObject accessibleObject; diff --git a/guava/src/com/google/common/reflect/TypeToken.java b/guava/src/com/google/common/reflect/TypeToken.java index 1ec9e28506cb..8abec1a57cab 100644 --- a/guava/src/com/google/common/reflect/TypeToken.java +++ b/guava/src/com/google/common/reflect/TypeToken.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.base.Predicate; @@ -590,7 +589,6 @@ public final TypeToken getComponentType() { * * @since 14.0 */ - @Beta public final Invokable method(Method method) { checkArgument( this.someRawTypeIsSubclassOf(method.getDeclaringClass()), @@ -630,7 +628,6 @@ public String toString() { * * @since 14.0 */ - @Beta public final Invokable constructor(Constructor constructor) { checkArgument( constructor.getDeclaringClass() == getRawType(),