From e5e0f660cc27b3473d67dded84418dee1c883fdf Mon Sep 17 00:00:00 2001 From: Kurt Alfred Kluever Date: Fri, 12 May 2023 08:30:05 -0700 Subject: [PATCH] Remove `@Beta` from various `Multimap`-related APIs. RELNOTES=`collect`: Remove `@Beta` from various `Multimap`-related APIs. PiperOrigin-RevId: 531513501 --- .../src/com/google/common/collect/ImmutableListMultimap.java | 3 --- .../guava/src/com/google/common/collect/ImmutableMultimap.java | 3 --- .../src/com/google/common/collect/ImmutableSetMultimap.java | 3 --- guava/src/com/google/common/collect/ImmutableListMultimap.java | 3 --- guava/src/com/google/common/collect/ImmutableMultimap.java | 3 --- guava/src/com/google/common/collect/ImmutableSetMultimap.java | 3 --- guava/src/com/google/common/collect/Multimaps.java | 2 -- 7 files changed, 20 deletions(-) diff --git a/android/guava/src/com/google/common/collect/ImmutableListMultimap.java b/android/guava/src/com/google/common/collect/ImmutableListMultimap.java index 2e5099e3e7be..fbc8ce2f5d74 100644 --- a/android/guava/src/com/google/common/collect/ImmutableListMultimap.java +++ b/android/guava/src/com/google/common/collect/ImmutableListMultimap.java @@ -16,7 +16,6 @@ package com.google.common.collect; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -168,7 +167,6 @@ public Builder put(Entry entry) { * @since 19.0 */ @CanIgnoreReturnValue - @Beta @Override public Builder putAll(Iterable> entries) { super.putAll(entries); @@ -271,7 +269,6 @@ public static ImmutableListMultimap copyOf( * @throws NullPointerException if any key, value, or entry is null * @since 19.0 */ - @Beta public static ImmutableListMultimap copyOf( Iterable> entries) { return new Builder().putAll(entries).build(); diff --git a/android/guava/src/com/google/common/collect/ImmutableMultimap.java b/android/guava/src/com/google/common/collect/ImmutableMultimap.java index 5484ef772abd..e4ad391f5079 100644 --- a/android/guava/src/com/google/common/collect/ImmutableMultimap.java +++ b/android/guava/src/com/google/common/collect/ImmutableMultimap.java @@ -21,7 +21,6 @@ import static com.google.common.collect.Maps.immutableEntry; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -194,7 +193,6 @@ public Builder put(Entry entry) { * @since 19.0 */ @CanIgnoreReturnValue - @Beta public Builder putAll(Iterable> entries) { for (Entry entry : entries) { put(entry); @@ -332,7 +330,6 @@ public static ImmutableMultimap copyOf(Multimap ImmutableMultimap copyOf( Iterable> entries) { return ImmutableListMultimap.copyOf(entries); diff --git a/android/guava/src/com/google/common/collect/ImmutableSetMultimap.java b/android/guava/src/com/google/common/collect/ImmutableSetMultimap.java index 3aa4179ba905..354a7c55f6f2 100644 --- a/android/guava/src/com/google/common/collect/ImmutableSetMultimap.java +++ b/android/guava/src/com/google/common/collect/ImmutableSetMultimap.java @@ -18,7 +18,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; @@ -194,7 +193,6 @@ public Builder put(Entry entry) { * @since 19.0 */ @CanIgnoreReturnValue - @Beta @Override public Builder putAll(Iterable> entries) { super.putAll(entries); @@ -317,7 +315,6 @@ private static ImmutableSetMultimap copyOf( * @throws NullPointerException if any key, value, or entry is null * @since 19.0 */ - @Beta public static ImmutableSetMultimap copyOf( Iterable> entries) { return new Builder().putAll(entries).build(); diff --git a/guava/src/com/google/common/collect/ImmutableListMultimap.java b/guava/src/com/google/common/collect/ImmutableListMultimap.java index c344ff36e461..b46e7ae409ad 100644 --- a/guava/src/com/google/common/collect/ImmutableListMultimap.java +++ b/guava/src/com/google/common/collect/ImmutableListMultimap.java @@ -16,7 +16,6 @@ package com.google.common.collect; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -244,7 +243,6 @@ public Builder put(Entry entry) { * @since 19.0 */ @CanIgnoreReturnValue - @Beta @Override public Builder putAll(Iterable> entries) { super.putAll(entries); @@ -347,7 +345,6 @@ public static ImmutableListMultimap copyOf( * @throws NullPointerException if any key, value, or entry is null * @since 19.0 */ - @Beta public static ImmutableListMultimap copyOf( Iterable> entries) { return new Builder().putAll(entries).build(); diff --git a/guava/src/com/google/common/collect/ImmutableMultimap.java b/guava/src/com/google/common/collect/ImmutableMultimap.java index 4b6d0227edb9..f1f654645297 100644 --- a/guava/src/com/google/common/collect/ImmutableMultimap.java +++ b/guava/src/com/google/common/collect/ImmutableMultimap.java @@ -21,7 +21,6 @@ import static com.google.common.collect.Maps.immutableEntry; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -196,7 +195,6 @@ public Builder put(Entry entry) { * @since 19.0 */ @CanIgnoreReturnValue - @Beta public Builder putAll(Iterable> entries) { for (Entry entry : entries) { put(entry); @@ -334,7 +332,6 @@ public static ImmutableMultimap copyOf(Multimap ImmutableMultimap copyOf( Iterable> entries) { return ImmutableListMultimap.copyOf(entries); diff --git a/guava/src/com/google/common/collect/ImmutableSetMultimap.java b/guava/src/com/google/common/collect/ImmutableSetMultimap.java index 8fbf452eee54..4887ae79b194 100644 --- a/guava/src/com/google/common/collect/ImmutableSetMultimap.java +++ b/guava/src/com/google/common/collect/ImmutableSetMultimap.java @@ -18,7 +18,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; @@ -279,7 +278,6 @@ public Builder put(Entry entry) { * @since 19.0 */ @CanIgnoreReturnValue - @Beta @Override public Builder putAll(Iterable> entries) { super.putAll(entries); @@ -402,7 +400,6 @@ private static ImmutableSetMultimap copyOf( * @throws NullPointerException if any key, value, or entry is null * @since 19.0 */ - @Beta public static ImmutableSetMultimap copyOf( Iterable> entries) { return new Builder().putAll(entries).build(); diff --git a/guava/src/com/google/common/collect/Multimaps.java b/guava/src/com/google/common/collect/Multimaps.java index 084cb69d786c..c614764c5a7a 100644 --- a/guava/src/com/google/common/collect/Multimaps.java +++ b/guava/src/com/google/common/collect/Multimaps.java @@ -22,7 +22,6 @@ import static com.google.common.collect.NullnessCasts.uncheckedCastNullableTToT; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -159,7 +158,6 @@ private Multimaps() {} * * @since 21.0 */ - @Beta public static < T extends @Nullable Object, K extends @Nullable Object,