Skip to content

Make some methods in AbstractMapBasedMultimap abstract since they are overridden in all subclasses. #8362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Apr 20, 2026
+6 −16
Merged

Make some methods in AbstractMapBasedMultimap abstract since they are overridden in all subclasses. #8362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions android/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import java.io.Serializable;
import java.util.AbstractCollection;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.ConcurrentModificationException;
import java.util.Iterator;
Expand Down Expand Up @@ -265,10 +264,8 @@ public Collection<V> removeAll(@Nullable Object key) {
return unmodifiableCollectionSubclass(output);
}

<E extends @Nullable Object> Collection<E> unmodifiableCollectionSubclass(
Collection<E> collection) {
return Collections.unmodifiableCollection(collection);
}
abstract <E extends @Nullable Object> Collection<E> unmodifiableCollectionSubclass(
Collection<E> collection);

@Override
public void clear() {
Expand Down Expand Up @@ -300,9 +297,7 @@ public Collection<V> get(@ParametricNullness K key) {
* Generates a decorated collection that remains consistent with the values in the multimap for
* the provided key. Changes to the multimap may alter the returned collection, and vice versa.
*/
Collection<V> wrapCollection(@ParametricNullness K key, Collection<V> collection) {
return new WrappedCollection(key, collection, null);
}
abstract Collection<V> wrapCollection(@ParametricNullness K key, Collection<V> collection);

final List<V> wrapList(
@ParametricNullness K key, List<V> list, @Nullable WrappedCollection ancestor) {
Expand Down
11 changes: 3 additions & 8 deletions guava/src/com/google/common/collect/AbstractMapBasedMultimap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import java.io.Serializable;
import java.util.AbstractCollection;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.ConcurrentModificationException;
import java.util.Iterator;
Expand Down Expand Up @@ -267,10 +266,8 @@ public Collection<V> removeAll(@Nullable Object key) {
return unmodifiableCollectionSubclass(output);
}

<E extends @Nullable Object> Collection<E> unmodifiableCollectionSubclass(
Collection<E> collection) {
return Collections.unmodifiableCollection(collection);
}
abstract <E extends @Nullable Object> Collection<E> unmodifiableCollectionSubclass(
Collection<E> collection);

@Override
public void clear() {
Expand Down Expand Up @@ -302,9 +299,7 @@ public Collection<V> get(@ParametricNullness K key) {
* Generates a decorated collection that remains consistent with the values in the multimap for
* the provided key. Changes to the multimap may alter the returned collection, and vice versa.
*/
Collection<V> wrapCollection(@ParametricNullness K key, Collection<V> collection) {
return new WrappedCollection(key, collection, null);
}
abstract Collection<V> wrapCollection(@ParametricNullness K key, Collection<V> collection);

final List<V> wrapList(
@ParametricNullness K key, List<V> list, @Nullable WrappedCollection ancestor) {
Expand Down
Loading