Skip to content

Commit 9f6a384

Browse files
netdpbGoogle Java Core Libraries
netdpb
authored and
Google Java Core Libraries
committed
Remove @Beta from most classes in com.google.common.reflect.
Addresses google#3051 (but doesn't remove `@Beta` from `Invokable`). RELNOTES=`reflect`: Remove `@Beta` from most classes. PiperOrigin-RevId: 419849834
1 parent 8079a29 commit 9f6a384

20 files changed

+12
-40
lines changed

‎android/guava/src/com/google/common/reflect/AbstractInvocationHandler.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
package com.google.common.reflect;
1616

17-
import com.google.common.annotations.Beta;
1817
import java.lang.reflect.InvocationHandler;
1918
import java.lang.reflect.Method;
2019
import java.lang.reflect.Proxy;
@@ -39,7 +38,6 @@
3938
* @author Ben Yu
4039
* @since 12.0
4140
*/
42-
@Beta
4341
@ElementTypesAreNonnullByDefault
4442
public abstract class AbstractInvocationHandler implements InvocationHandler {
4543

‎android/guava/src/com/google/common/reflect/ClassPath.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import static com.google.common.base.StandardSystemProperty.PATH_SEPARATOR;
2121
import static java.util.logging.Level.WARNING;
2222

23-
import com.google.common.annotations.Beta;
2423
import com.google.common.annotations.VisibleForTesting;
2524
import com.google.common.base.CharMatcher;
2625
import com.google.common.base.Splitter;
@@ -91,7 +90,6 @@
9190
* @author Ben Yu
9291
* @since 14.0
9392
*/
94-
@Beta
9593
@ElementTypesAreNonnullByDefault
9694
public final class ClassPath {
9795
private static final Logger logger = Logger.getLogger(ClassPath.class.getName());
@@ -204,7 +202,6 @@ public ImmutableSet<ClassInfo> getTopLevelClassesRecursive(String packageName) {
204202
*
205203
* @since 14.0
206204
*/
207-
@Beta
208205
public static class ResourceInfo {
209206
private final File file;
210207
private final String resourceName;
@@ -300,7 +297,6 @@ public String toString() {
300297
*
301298
* @since 14.0
302299
*/
303-
@Beta
304300
public static final class ClassInfo extends ResourceInfo {
305301
private final String className;
306302

‎android/guava/src/com/google/common/reflect/ImmutableTypeToInstanceMap.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
package com.google.common.reflect;
1616

17-
import com.google.common.annotations.Beta;
1817
import com.google.common.collect.ForwardingMap;
1918
import com.google.common.collect.ImmutableMap;
2019
import com.google.errorprone.annotations.CanIgnoreReturnValue;
@@ -29,7 +28,6 @@
2928
* @author Ben Yu
3029
* @since 13.0
3130
*/
32-
@Beta
3331
@ElementTypesAreNonnullByDefault
3432
public final class ImmutableTypeToInstanceMap<B> extends ForwardingMap<TypeToken<? extends B>, B>
3533
implements TypeToInstanceMap<B> {
@@ -60,7 +58,6 @@ public static <B> Builder<B> builder() {
6058
*
6159
* @since 13.0
6260
*/
63-
@Beta
6461
public static final class Builder<B> {
6562
private final ImmutableMap.Builder<TypeToken<? extends B>, B> mapBuilder =
6663
ImmutableMap.builder();

‎android/guava/src/com/google/common/reflect/MutableTypeToInstanceMap.java

Lines changed: 0 additions & 2 deletions
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.collect.ForwardingMap;
2120
import com.google.common.collect.ForwardingMapEntry;
2221
import com.google.common.collect.ForwardingSet;
@@ -39,7 +38,6 @@
3938
* @author Ben Yu
4039
* @since 13.0
4140
*/
42-
@Beta
4341
@ElementTypesAreNonnullByDefault
4442
public final class MutableTypeToInstanceMap<B> extends ForwardingMap<TypeToken<? extends B>, B>
4543
implements TypeToInstanceMap<B> {

‎android/guava/src/com/google/common/reflect/Parameter.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
/**
2828
* Represents a method or constructor parameter.
2929
*
30+
* <p><b>Note:</b> Since Java 8 introduced {@link java.lang.reflect.Parameter} to represent method
31+
* and constructor parameters, this class is no longer necessary. We intend to deprecate it in a
32+
* future version.
33+
*
3034
* @author Ben Yu
3135
* @since 14.0
3236
*/

‎android/guava/src/com/google/common/reflect/Reflection.java

Lines changed: 0 additions & 2 deletions
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 java.lang.reflect.InvocationHandler;
2221
import java.lang.reflect.Proxy;
2322

@@ -26,7 +25,6 @@
2625
*
2726
* @since 12.0
2827
*/
29-
@Beta
3028
@ElementTypesAreNonnullByDefault
3129
public final class Reflection {
3230

‎android/guava/src/com/google/common/reflect/TypeParameter.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

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

19-
import com.google.common.annotations.Beta;
2019
import java.lang.reflect.Type;
2120
import java.lang.reflect.TypeVariable;
2221
import javax.annotation.CheckForNull;
@@ -34,7 +33,6 @@
3433
* @author Ben Yu
3534
* @since 12.0
3635
*/
37-
@Beta
3836
@ElementTypesAreNonnullByDefault
3937
/*
4038
* A nullable bound would let users create a TypeParameter instance for a parameter with a nullable

‎android/guava/src/com/google/common/reflect/TypeResolver.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static com.google.common.base.Preconditions.checkState;
2020
import static java.util.Arrays.asList;
2121

22-
import com.google.common.annotations.Beta;
2322
import com.google.common.base.Joiner;
2423
import com.google.common.base.Objects;
2524
import com.google.common.collect.ImmutableMap;
@@ -51,7 +50,6 @@
5150
* @author Ben Yu
5251
* @since 15.0
5352
*/
54-
@Beta
5553
@ElementTypesAreNonnullByDefault
5654
public final class TypeResolver {
5755

‎android/guava/src/com/google/common/reflect/TypeToInstanceMap.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
package com.google.common.reflect;
1616

17-
import com.google.common.annotations.Beta;
1817
import com.google.errorprone.annotations.CanIgnoreReturnValue;
1918
import com.google.errorprone.annotations.DoNotMock;
2019
import java.util.Map;
@@ -42,7 +41,6 @@
4241
* @author Ben Yu
4342
* @since 13.0
4443
*/
45-
@Beta
4644
@DoNotMock("Use ImmutableTypeToInstanceMap or MutableTypeToInstanceMap")
4745
@ElementTypesAreNonnullByDefault
4846
public interface TypeToInstanceMap<B> extends Map<TypeToken<? extends B>, B> {

‎android/guava/src/com/google/common/reflect/TypeToken.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@
9797
* @author Ben Yu
9898
* @since 12.0
9999
*/
100-
@Beta
101100
@SuppressWarnings("serial") // SimpleTypeToken is the serialized form.
102101
@ElementTypesAreNonnullByDefault
103102
public abstract class TypeToken<T> extends TypeCapture<T> implements Serializable {
@@ -591,6 +590,7 @@ public final TypeToken<?> getComponentType() {
591590
*
592591
* @since 14.0
593592
*/
593+
@Beta
594594
public final Invokable<T, Object> method(Method method) {
595595
checkArgument(
596596
this.someRawTypeIsSubclassOf(method.getDeclaringClass()),
@@ -630,6 +630,7 @@ public String toString() {
630630
*
631631
* @since 14.0
632632
*/
633+
@Beta
633634
public final Invokable<T, T> constructor(Constructor<?> constructor) {
634635
checkArgument(
635636
constructor.getDeclaringClass() == getRawType(),

0 commit comments

Comments
 (0)