Skip to content

Commit c86c09d

Browse files
cpovirkGoogle Java Core Libraries
cpovirk
authored and
Google Java Core Libraries
committed
Remove @Beta from the guava-android Collector APIs.
(progress toward #6567) RELNOTES=`collect`: Removed `@Beta` from the `guava-android` `Collector` APIs. PiperOrigin-RevId: 639518116
1 parent 25322a7 commit c86c09d

20 files changed

+0
-58
lines changed

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

-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static com.google.common.base.Preconditions.checkNotNull;
2020
import static com.google.common.collect.CollectPreconditions.checkNonnegative;
2121

22-
import com.google.common.annotations.Beta;
2322
import com.google.common.annotations.GwtCompatible;
2423
import java.util.Comparator;
2524
import java.util.Iterator;
@@ -132,7 +131,6 @@ private Comparators() {}
132131
*/
133132
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
134133
@IgnoreJRERequirement // Users will use this only if they're already using streams.
135-
@Beta // TODO: b/288085449 - Remove.
136134
public static <T extends @Nullable Object> Collector<T, ?, List<T>> least(
137135
int k, Comparator<? super T> comparator) {
138136
checkNonnegative(k, "k");
@@ -167,7 +165,6 @@ private Comparators() {}
167165
*/
168166
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
169167
@IgnoreJRERequirement // Users will use this only if they're already using streams.
170-
@Beta // TODO: b/288085449 - Remove.
171168
public static <T extends @Nullable Object> Collector<T, ?, List<T>> greatest(
172169
int k, Comparator<? super T> comparator) {
173170
return least(k, comparator.reversed());

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

-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static com.google.common.collect.CollectPreconditions.checkEntryNotNull;
2020
import static com.google.common.collect.CollectPreconditions.checkNonnegative;
2121

22-
import com.google.common.annotations.Beta;
2322
import com.google.common.annotations.GwtCompatible;
2423
import com.google.common.annotations.J2ktIncompatible;
2524
import com.google.errorprone.annotations.CanIgnoreReturnValue;
@@ -62,7 +61,6 @@ public abstract class ImmutableBiMap<K, V> extends ImmutableMap<K, V> implements
6261
*/
6362
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
6463
@IgnoreJRERequirement // Users will use this only if they're already using streams.
65-
@Beta // TODO: b/288085449 - Remove.
6664
public static <T extends @Nullable Object, K, V>
6765
Collector<T, ?, ImmutableBiMap<K, V>> toImmutableBiMap(
6866
Function<? super T, ? extends K> keyFunction,
@@ -632,7 +630,6 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
632630
@DoNotCall("Use toImmutableBiMap")
633631
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
634632
@IgnoreJRERequirement // Users will use this only if they're already using streams.
635-
@Beta // TODO: b/288085449 - Remove.
636633
public static <T extends @Nullable Object, K, V>
637634
Collector<T, ?, ImmutableMap<K, V>> toImmutableMap(
638635
Function<? super T, ? extends K> keyFunction,
@@ -653,7 +650,6 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
653650
@DoNotCall("Use toImmutableBiMap")
654651
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
655652
@IgnoreJRERequirement // Users will use this only if they're already using streams.
656-
@Beta // TODO: b/288085449 - Remove.
657653
public static <T extends @Nullable Object, K, V>
658654
Collector<T, ?, ImmutableMap<K, V>> toImmutableMap(
659655
Function<? super T, ? extends K> keyFunction,

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

-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import static com.google.common.collect.ObjectArrays.checkElementsNotNull;
2626
import static com.google.common.collect.RegularImmutableList.EMPTY;
2727

28-
import com.google.common.annotations.Beta;
2928
import com.google.common.annotations.GwtCompatible;
3029
import com.google.common.annotations.GwtIncompatible;
3130
import com.google.common.annotations.J2ktIncompatible;
@@ -72,7 +71,6 @@ public abstract class ImmutableList<E> extends ImmutableCollection<E>
7271
*/
7372
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
7473
@IgnoreJRERequirement // Users will use this only if they're already using streams.
75-
@Beta // TODO: b/288085449 - Remove.
7674
public static <E> Collector<E, ?, ImmutableList<E>> toImmutableList() {
7775
return CollectCollectors.toImmutableList();
7876
}

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

-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import static java.util.Objects.requireNonNull;
2020

21-
import com.google.common.annotations.Beta;
2221
import com.google.common.annotations.GwtCompatible;
2322
import com.google.common.annotations.GwtIncompatible;
2423
import com.google.common.annotations.J2ktIncompatible;
@@ -84,7 +83,6 @@ public class ImmutableListMultimap<K, V> extends ImmutableMultimap<K, V>
8483
*/
8584
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
8685
@IgnoreJRERequirement // Users will use this only if they're already using streams.
87-
@Beta // TODO: b/288085449 - Remove.
8886
public static <T extends @Nullable Object, K, V>
8987
Collector<T, ?, ImmutableListMultimap<K, V>> toImmutableListMultimap(
9088
Function<? super T, ? extends K> keyFunction,
@@ -125,7 +123,6 @@ public class ImmutableListMultimap<K, V> extends ImmutableMultimap<K, V>
125123
*/
126124
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
127125
@IgnoreJRERequirement // Users will use this only if they're already using streams.
128-
@Beta // TODO: b/288085449 - Remove.
129126
public static <T extends @Nullable Object, K, V>
130127
Collector<T, ?, ImmutableListMultimap<K, V>> flatteningToImmutableListMultimap(
131128
Function<? super T, ? extends K> keyFunction,

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

-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import static com.google.common.collect.CollectPreconditions.checkNonnegative;
2323
import static java.util.Objects.requireNonNull;
2424

25-
import com.google.common.annotations.Beta;
2625
import com.google.common.annotations.GwtCompatible;
2726
import com.google.common.annotations.GwtIncompatible;
2827
import com.google.common.annotations.J2ktIncompatible;
@@ -85,7 +84,6 @@ public abstract class ImmutableMap<K, V> implements Map<K, V>, Serializable {
8584
*/
8685
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
8786
@IgnoreJRERequirement // Users will use this only if they're already using streams.
88-
@Beta // TODO: b/288085449 - Remove.
8987
public static <T extends @Nullable Object, K, V>
9088
Collector<T, ?, ImmutableMap<K, V>> toImmutableMap(
9189
Function<? super T, ? extends K> keyFunction,
@@ -108,7 +106,6 @@ public abstract class ImmutableMap<K, V> implements Map<K, V>, Serializable {
108106
*/
109107
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
110108
@IgnoreJRERequirement // Users will use this only if they're already using streams.
111-
@Beta // TODO: b/288085449 - Remove.
112109
public static <T extends @Nullable Object, K, V>
113110
Collector<T, ?, ImmutableMap<K, V>> toImmutableMap(
114111
Function<? super T, ? extends K> keyFunction,

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

-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static com.google.common.base.Preconditions.checkNotNull;
2020
import static java.util.Objects.requireNonNull;
2121

22-
import com.google.common.annotations.Beta;
2322
import com.google.common.annotations.GwtCompatible;
2423
import com.google.common.annotations.GwtIncompatible;
2524
import com.google.common.annotations.J2ktIncompatible;
@@ -70,7 +69,6 @@ public abstract class ImmutableMultiset<E> extends ImmutableMultisetGwtSerializa
7069
*/
7170
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
7271
@IgnoreJRERequirement // Users will use this only if they're already using streams.
73-
@Beta // TODO: b/288085449 - Remove.
7472
public static <E> Collector<E, ?, ImmutableMultiset<E>> toImmutableMultiset() {
7573
return CollectCollectors.toImmutableMultiset(Function.identity(), e -> 1);
7674
}
@@ -88,7 +86,6 @@ public abstract class ImmutableMultiset<E> extends ImmutableMultisetGwtSerializa
8886
*/
8987
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
9088
@IgnoreJRERequirement // Users will use this only if they're already using streams.
91-
@Beta // TODO: b/288085449 - Remove.
9289
public static <T extends @Nullable Object, E>
9390
Collector<T, ?, ImmutableMultiset<E>> toImmutableMultiset(
9491
Function<? super T, ? extends E> elementFunction,

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

-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import static com.google.common.base.Preconditions.checkElementIndex;
1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

21-
import com.google.common.annotations.Beta;
2221
import com.google.common.annotations.GwtIncompatible;
2322
import com.google.common.annotations.J2ktIncompatible;
2423
import com.google.common.collect.SortedLists.KeyAbsentBehavior;
@@ -61,7 +60,6 @@ public class ImmutableRangeMap<K extends Comparable<?>, V> implements RangeMap<K
6160
*/
6261
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
6362
@IgnoreJRERequirement // Users will use this only if they're already using streams.
64-
@Beta // TODO: b/288085449 - Remove.
6563
public static <T extends @Nullable Object, K extends Comparable<? super K>, V>
6664
Collector<T, ?, ImmutableRangeMap<K, V>> toImmutableRangeMap(
6765
Function<? super T, Range<K>> keyFunction,

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

-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import static com.google.common.collect.SortedLists.KeyPresentBehavior.ANY_PRESENT;
2323
import static java.util.Objects.requireNonNull;
2424

25-
import com.google.common.annotations.Beta;
2625
import com.google.common.annotations.GwtIncompatible;
2726
import com.google.common.annotations.J2ktIncompatible;
2827
import com.google.common.collect.SortedLists.KeyAbsentBehavior;
@@ -70,7 +69,6 @@ public final class ImmutableRangeSet<C extends Comparable> extends AbstractRange
7069
*/
7170
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
7271
@IgnoreJRERequirement // Users will use this only if they're already using streams.
73-
@Beta // TODO: b/288085449 - Remove.
7472
public static <E extends Comparable<? super E>>
7573
Collector<Range<E>, ?, ImmutableRangeSet<E>> toImmutableRangeSet() {
7674
return CollectCollectors.toImmutableRangeSet();

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

-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import static com.google.common.collect.ObjectArrays.checkElementNotNull;
2323
import static java.util.Objects.requireNonNull;
2424

25-
import com.google.common.annotations.Beta;
2625
import com.google.common.annotations.GwtCompatible;
2726
import com.google.common.annotations.J2ktIncompatible;
2827
import com.google.common.annotations.VisibleForTesting;
@@ -64,7 +63,6 @@ public abstract class ImmutableSet<E> extends ImmutableCollection<E> implements
6463
*/
6564
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
6665
@IgnoreJRERequirement // Users will use this only if they're already using streams.
67-
@Beta // TODO: b/288085449 - Remove.
6866
public static <E> Collector<E, ?, ImmutableSet<E>> toImmutableSet() {
6967
return CollectCollectors.toImmutableSet();
7068
}

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

-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static com.google.common.base.Preconditions.checkNotNull;
2020
import static java.util.Objects.requireNonNull;
2121

22-
import com.google.common.annotations.Beta;
2322
import com.google.common.annotations.GwtCompatible;
2423
import com.google.common.annotations.GwtIncompatible;
2524
import com.google.common.annotations.J2ktIncompatible;
@@ -92,7 +91,6 @@ public class ImmutableSetMultimap<K, V> extends ImmutableMultimap<K, V>
9291
*/
9392
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
9493
@IgnoreJRERequirement // Users will use this only if they're already using streams.
95-
@Beta // TODO: b/288085449 - Remove.
9694
public static <T extends @Nullable Object, K, V>
9795
Collector<T, ?, ImmutableSetMultimap<K, V>> toImmutableSetMultimap(
9896
Function<? super T, ? extends K> keyFunction,
@@ -142,7 +140,6 @@ public class ImmutableSetMultimap<K, V> extends ImmutableMultimap<K, V>
142140
*/
143141
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
144142
@IgnoreJRERequirement // Users will use this only if they're already using streams.
145-
@Beta // TODO: b/288085449 - Remove.
146143
public static <T extends @Nullable Object, K, V>
147144
Collector<T, ?, ImmutableSetMultimap<K, V>> flatteningToImmutableSetMultimap(
148145
Function<? super T, ? extends K> keyFunction,

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

-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import static com.google.common.collect.Maps.keyOrNull;
2323
import static java.util.Objects.requireNonNull;
2424

25-
import com.google.common.annotations.Beta;
2625
import com.google.common.annotations.GwtCompatible;
2726
import com.google.common.annotations.GwtIncompatible;
2827
import com.google.common.annotations.J2ktIncompatible;
@@ -79,7 +78,6 @@ public final class ImmutableSortedMap<K, V> extends ImmutableMap<K, V>
7978
*/
8079
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
8180
@IgnoreJRERequirement // Users will use this only if they're already using streams.
82-
@Beta // TODO: b/288085449 - Remove.
8381
public static <T extends @Nullable Object, K, V>
8482
Collector<T, ?, ImmutableSortedMap<K, V>> toImmutableSortedMap(
8583
Comparator<? super K> comparator,
@@ -101,7 +99,6 @@ public final class ImmutableSortedMap<K, V> extends ImmutableMap<K, V>
10199
*/
102100
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
103101
@IgnoreJRERequirement // Users will use this only if they're already using streams.
104-
@Beta // TODO: b/288085449 - Remove.
105102
public static <T extends @Nullable Object, K, V>
106103
Collector<T, ?, ImmutableSortedMap<K, V>> toImmutableSortedMap(
107104
Comparator<? super K> comparator,
@@ -1229,7 +1226,6 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
12291226
@Deprecated
12301227
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
12311228
@IgnoreJRERequirement // Users will use this only if they're already using streams.
1232-
@Beta // TODO: b/288085449 - Remove.
12331229
public static <T extends @Nullable Object, K, V>
12341230
Collector<T, ?, ImmutableMap<K, V>> toImmutableMap(
12351231
Function<? super T, ? extends K> keyFunction,
@@ -1250,7 +1246,6 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
12501246
@Deprecated
12511247
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
12521248
@IgnoreJRERequirement // Users will use this only if they're already using streams.
1253-
@Beta // TODO: b/288085449 - Remove.
12541249
public static <T extends @Nullable Object, K, V>
12551250
Collector<T, ?, ImmutableMap<K, V>> toImmutableMap(
12561251
Function<? super T, ? extends K> keyFunction,

‎android/guava/src/com/google/common/collect/ImmutableSortedMultiset.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.GwtIncompatible;
2221
import com.google.common.annotations.J2ktIncompatible;
2322
import com.google.common.annotations.VisibleForTesting;
@@ -73,7 +72,6 @@ public abstract class ImmutableSortedMultiset<E> extends ImmutableMultiset<E>
7372
*/
7473
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
7574
@IgnoreJRERequirement // Users will use this only if they're already using streams.
76-
@Beta // TODO: b/288085449 - Remove.
7775
public static <E> Collector<E, ?, ImmutableSortedMultiset<E>> toImmutableSortedMultiset(
7876
Comparator<? super E> comparator) {
7977
return toImmutableSortedMultiset(comparator, Function.identity(), e -> 1);
@@ -92,7 +90,6 @@ public abstract class ImmutableSortedMultiset<E> extends ImmutableMultiset<E>
9290
*/
9391
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
9492
@IgnoreJRERequirement // Users will use this only if they're already using streams.
95-
@Beta // TODO: b/288085449 - Remove.
9693
public static <T extends @Nullable Object, E>
9794
Collector<T, ?, ImmutableSortedMultiset<E>> toImmutableSortedMultiset(
9895
Comparator<? super E> comparator,
@@ -766,7 +763,6 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
766763
@Deprecated
767764
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
768765
@IgnoreJRERequirement // Users will use this only if they're already using streams.
769-
@Beta // TODO: b/288085449 - Remove.
770766
public static <E> Collector<E, ?, ImmutableMultiset<E>> toImmutableMultiset() {
771767
throw new UnsupportedOperationException();
772768
}
@@ -784,7 +780,6 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
784780
@Deprecated
785781
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
786782
@IgnoreJRERequirement // Users will use this only if they're already using streams.
787-
@Beta // TODO: b/288085449 - Remove.
788783
public static <T extends @Nullable Object, E>
789784
Collector<T, ?, ImmutableMultiset<E>> toImmutableMultiset(
790785
Function<? super T, ? extends E> elementFunction,

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

-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import static com.google.common.base.Preconditions.checkNotNull;
2121
import static com.google.common.collect.ObjectArrays.checkElementsNotNull;
2222

23-
import com.google.common.annotations.Beta;
2423
import com.google.common.annotations.GwtCompatible;
2524
import com.google.common.annotations.GwtIncompatible;
2625
import com.google.common.annotations.J2ktIncompatible;
@@ -75,7 +74,6 @@ public abstract class ImmutableSortedSet<E> extends ImmutableSet<E>
7574
*/
7675
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
7776
@IgnoreJRERequirement // Users will use this only if they're already using streams.
78-
@Beta // TODO: b/288085449 - Remove.
7977
public static <E> Collector<E, ?, ImmutableSortedSet<E>> toImmutableSortedSet(
8078
Comparator<? super E> comparator) {
8179
return CollectCollectors.toImmutableSortedSet(comparator);
@@ -803,7 +801,6 @@ Object writeReplace() {
803801
@Deprecated
804802
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
805803
@IgnoreJRERequirement // Users will use this only if they're already using streams.
806-
@Beta // TODO: b/288085449 - Remove.
807804
public static <E> Collector<E, ?, ImmutableSet<E>> toImmutableSet() {
808805
throw new UnsupportedOperationException();
809806
}

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

-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

21-
import com.google.common.annotations.Beta;
2221
import com.google.common.annotations.GwtCompatible;
2322
import com.google.common.annotations.GwtIncompatible;
2423
import com.google.common.annotations.J2ktIncompatible;
@@ -66,7 +65,6 @@ public abstract class ImmutableTable<R, C, V> extends AbstractTable<R, C, V>
6665
*/
6766
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
6867
@IgnoreJRERequirement // Users will use this only if they're already using streams.
69-
@Beta // TODO: b/288085449 - Remove.
7068
public static <T extends @Nullable Object, R, C, V>
7169
Collector<T, ?, ImmutableTable<R, C, V>> toImmutableTable(
7270
Function<? super T, ? extends R> rowFunction,
@@ -88,7 +86,6 @@ public abstract class ImmutableTable<R, C, V> extends AbstractTable<R, C, V>
8886
*/
8987
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
9088
@IgnoreJRERequirement // Users will use this only if they're already using streams.
91-
@Beta // TODO: b/288085449 - Remove.
9289
public static <T extends @Nullable Object, R, C, V>
9390
Collector<T, ?, ImmutableTable<R, C, V>> toImmutableTable(
9491
Function<? super T, ? extends R> rowFunction,

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

-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import static java.util.Collections.singletonMap;
2626
import static java.util.Objects.requireNonNull;
2727

28-
import com.google.common.annotations.Beta;
2928
import com.google.common.annotations.GwtCompatible;
3029
import com.google.common.annotations.GwtIncompatible;
3130
import com.google.common.annotations.J2ktIncompatible;
@@ -195,7 +194,6 @@ public static <K extends Enum<K>, V> ImmutableMap<K, V> immutableEnumMap(
195194
*/
196195
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
197196
@IgnoreJRERequirement // Users will use this only if they're already using streams.
198-
@Beta // TODO: b/288085449 - Remove.
199197
public static <T extends @Nullable Object, K extends Enum<K>, V>
200198
Collector<T, ?, ImmutableMap<K, V>> toImmutableEnumMap(
201199
java.util.function.Function<? super T, ? extends K> keyFunction,
@@ -216,7 +214,6 @@ public static <K extends Enum<K>, V> ImmutableMap<K, V> immutableEnumMap(
216214
*/
217215
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
218216
@IgnoreJRERequirement // Users will use this only if they're already using streams.
219-
@Beta // TODO: b/288085449 - Remove.
220217
public static <T extends @Nullable Object, K extends Enum<K>, V>
221218
Collector<T, ?, ImmutableMap<K, V>> toImmutableEnumMap(
222219
java.util.function.Function<? super T, ? extends K> keyFunction,

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

-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static com.google.common.base.Preconditions.checkNotNull;
2020
import static java.util.Collections.emptyList;
2121

22-
import com.google.common.annotations.Beta;
2322
import com.google.common.annotations.GwtCompatible;
2423
import java.util.ArrayList;
2524
import java.util.List;
@@ -40,7 +39,6 @@
4039
@ElementTypesAreNonnullByDefault
4140
@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
4241
@IgnoreJRERequirement // Users will use this only if they're already using streams.
43-
@Beta // TODO: b/288085449 - Remove.
4442
public final class MoreCollectors {
4543

4644
/*

0 commit comments

Comments
 (0)