Skip to content

Commit e5e0f66

Browse files
klueverGoogle Java Core Libraries
kluever
authored and
Google Java Core Libraries
committed
Remove @Beta from various Multimap-related APIs.
RELNOTES=`collect`: Remove `@Beta` from various `Multimap`-related APIs. PiperOrigin-RevId: 531513501
1 parent 9760dbc commit e5e0f66

File tree

7 files changed

+0
-20
lines changed

7 files changed

+0
-20
lines changed

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

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

1717
package com.google.common.collect;
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;
@@ -168,7 +167,6 @@ public Builder<K, V> put(Entry<? extends K, ? extends V> entry) {
168167
* @since 19.0
169168
*/
170169
@CanIgnoreReturnValue
171-
@Beta
172170
@Override
173171
public Builder<K, V> putAll(Iterable<? extends Entry<? extends K, ? extends V>> entries) {
174172
super.putAll(entries);
@@ -271,7 +269,6 @@ public static <K, V> ImmutableListMultimap<K, V> copyOf(
271269
* @throws NullPointerException if any key, value, or entry is null
272270
* @since 19.0
273271
*/
274-
@Beta
275272
public static <K, V> ImmutableListMultimap<K, V> copyOf(
276273
Iterable<? extends Entry<? extends K, ? extends V>> entries) {
277274
return new Builder<K, V>().putAll(entries).build();

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import static com.google.common.collect.Maps.immutableEntry;
2222
import static java.util.Objects.requireNonNull;
2323

24-
import com.google.common.annotations.Beta;
2524
import com.google.common.annotations.GwtCompatible;
2625
import com.google.common.annotations.GwtIncompatible;
2726
import com.google.common.annotations.J2ktIncompatible;
@@ -194,7 +193,6 @@ public Builder<K, V> put(Entry<? extends K, ? extends V> entry) {
194193
* @since 19.0
195194
*/
196195
@CanIgnoreReturnValue
197-
@Beta
198196
public Builder<K, V> putAll(Iterable<? extends Entry<? extends K, ? extends V>> entries) {
199197
for (Entry<? extends K, ? extends V> entry : entries) {
200198
put(entry);
@@ -332,7 +330,6 @@ public static <K, V> ImmutableMultimap<K, V> copyOf(Multimap<? extends K, ? exte
332330
* @throws NullPointerException if any key, value, or entry is null
333331
* @since 19.0
334332
*/
335-
@Beta
336333
public static <K, V> ImmutableMultimap<K, V> copyOf(
337334
Iterable<? extends Entry<? extends K, ? extends V>> entries) {
338335
return ImmutableListMultimap.copyOf(entries);

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

Lines changed: 0 additions & 3 deletions
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;
@@ -194,7 +193,6 @@ public Builder<K, V> put(Entry<? extends K, ? extends V> entry) {
194193
* @since 19.0
195194
*/
196195
@CanIgnoreReturnValue
197-
@Beta
198196
@Override
199197
public Builder<K, V> putAll(Iterable<? extends Entry<? extends K, ? extends V>> entries) {
200198
super.putAll(entries);
@@ -317,7 +315,6 @@ private static <K, V> ImmutableSetMultimap<K, V> copyOf(
317315
* @throws NullPointerException if any key, value, or entry is null
318316
* @since 19.0
319317
*/
320-
@Beta
321318
public static <K, V> ImmutableSetMultimap<K, V> copyOf(
322319
Iterable<? extends Entry<? extends K, ? extends V>> entries) {
323320
return new Builder<K, V>().putAll(entries).build();

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

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

1717
package com.google.common.collect;
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;
@@ -244,7 +243,6 @@ public Builder<K, V> put(Entry<? extends K, ? extends V> entry) {
244243
* @since 19.0
245244
*/
246245
@CanIgnoreReturnValue
247-
@Beta
248246
@Override
249247
public Builder<K, V> putAll(Iterable<? extends Entry<? extends K, ? extends V>> entries) {
250248
super.putAll(entries);
@@ -347,7 +345,6 @@ public static <K, V> ImmutableListMultimap<K, V> copyOf(
347345
* @throws NullPointerException if any key, value, or entry is null
348346
* @since 19.0
349347
*/
350-
@Beta
351348
public static <K, V> ImmutableListMultimap<K, V> copyOf(
352349
Iterable<? extends Entry<? extends K, ? extends V>> entries) {
353350
return new Builder<K, V>().putAll(entries).build();

‎guava/src/com/google/common/collect/ImmutableMultimap.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import static com.google.common.collect.Maps.immutableEntry;
2222
import static java.util.Objects.requireNonNull;
2323

24-
import com.google.common.annotations.Beta;
2524
import com.google.common.annotations.GwtCompatible;
2625
import com.google.common.annotations.GwtIncompatible;
2726
import com.google.common.annotations.J2ktIncompatible;
@@ -196,7 +195,6 @@ public Builder<K, V> put(Entry<? extends K, ? extends V> entry) {
196195
* @since 19.0
197196
*/
198197
@CanIgnoreReturnValue
199-
@Beta
200198
public Builder<K, V> putAll(Iterable<? extends Entry<? extends K, ? extends V>> entries) {
201199
for (Entry<? extends K, ? extends V> entry : entries) {
202200
put(entry);
@@ -334,7 +332,6 @@ public static <K, V> ImmutableMultimap<K, V> copyOf(Multimap<? extends K, ? exte
334332
* @throws NullPointerException if any key, value, or entry is null
335333
* @since 19.0
336334
*/
337-
@Beta
338335
public static <K, V> ImmutableMultimap<K, V> copyOf(
339336
Iterable<? extends Entry<? extends K, ? extends V>> entries) {
340337
return ImmutableListMultimap.copyOf(entries);

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

Lines changed: 0 additions & 3 deletions
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;
@@ -279,7 +278,6 @@ public Builder<K, V> put(Entry<? extends K, ? extends V> entry) {
279278
* @since 19.0
280279
*/
281280
@CanIgnoreReturnValue
282-
@Beta
283281
@Override
284282
public Builder<K, V> putAll(Iterable<? extends Entry<? extends K, ? extends V>> entries) {
285283
super.putAll(entries);
@@ -402,7 +400,6 @@ private static <K, V> ImmutableSetMultimap<K, V> copyOf(
402400
* @throws NullPointerException if any key, value, or entry is null
403401
* @since 19.0
404402
*/
405-
@Beta
406403
public static <K, V> ImmutableSetMultimap<K, V> copyOf(
407404
Iterable<? extends Entry<? extends K, ? extends V>> entries) {
408405
return new Builder<K, V>().putAll(entries).build();

‎guava/src/com/google/common/collect/Multimaps.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import static com.google.common.collect.NullnessCasts.uncheckedCastNullableTToT;
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;
@@ -159,7 +158,6 @@ private Multimaps() {}
159158
*
160159
* @since 21.0
161160
*/
162-
@Beta
163161
public static <
164162
T extends @Nullable Object,
165163
K extends @Nullable Object,

0 commit comments

Comments
 (0)