diff options
Diffstat (limited to 'guava/src/com/google/common/collect/ImmutableListMultimap.java')
-rw-r--r-- | guava/src/com/google/common/collect/ImmutableListMultimap.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/guava/src/com/google/common/collect/ImmutableListMultimap.java b/guava/src/com/google/common/collect/ImmutableListMultimap.java index 0184c5bf1..b46e7ae40 100644 --- a/guava/src/com/google/common/collect/ImmutableListMultimap.java +++ b/guava/src/com/google/common/collect/ImmutableListMultimap.java @@ -16,10 +16,9 @@ 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; import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.DoNotCall; import com.google.errorprone.annotations.concurrent.LazyInit; @@ -244,7 +243,6 @@ public class ImmutableListMultimap<K, V> extends ImmutableMultimap<K, V> * @since 19.0 */ @CanIgnoreReturnValue - @Beta @Override public Builder<K, V> putAll(Iterable<? extends Entry<? extends K, ? extends V>> entries) { super.putAll(entries); @@ -347,7 +345,6 @@ public class ImmutableListMultimap<K, V> extends ImmutableMultimap<K, V> * @throws NullPointerException if any key, value, or entry is null * @since 19.0 */ - @Beta public static <K, V> ImmutableListMultimap<K, V> copyOf( Iterable<? extends Entry<? extends K, ? extends V>> entries) { return new Builder<K, V>().putAll(entries).build(); @@ -356,7 +353,7 @@ public class ImmutableListMultimap<K, V> extends ImmutableMultimap<K, V> /** Creates an ImmutableListMultimap from an asMap.entrySet. */ static <K, V> ImmutableListMultimap<K, V> fromMapEntries( Collection<? extends Map.Entry<? extends K, ? extends Collection<? extends V>>> mapEntries, - @Nullable Comparator<? super V> valueComparator) { + @CheckForNull Comparator<? super V> valueComparator) { if (mapEntries.isEmpty()) { return of(); } @@ -458,12 +455,14 @@ public class ImmutableListMultimap<K, V> extends ImmutableMultimap<K, V> * values for that key, and the key's values */ @GwtIncompatible // java.io.ObjectOutputStream + @J2ktIncompatible private void writeObject(ObjectOutputStream stream) throws IOException { stream.defaultWriteObject(); Serialization.writeMultimap(this, stream); } @GwtIncompatible // java.io.ObjectInputStream + @J2ktIncompatible private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException { stream.defaultReadObject(); int keyCount = stream.readInt(); @@ -500,5 +499,6 @@ public class ImmutableListMultimap<K, V> extends ImmutableMultimap<K, V> } @GwtIncompatible // Not needed in emulated source + @J2ktIncompatible private static final long serialVersionUID = 0; } |