root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Avoid generic type parameter hiding in UnmodifiableValueCollection

This commit is contained in:
Sam Brannen 2021-10-29 11:32:44 +02:00
parent 4464468465
commit 56fd97184c
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
spring-core/src/main/java/org/springframework/util/UnmodifiableMultiValueMap.java
View File

@ -527,14 +527,14 @@ final class UnmodifiableMultiValueMap<K,V> implements MultiValueMap<K,V>, Serial
} }
private static class UnmodifiableValueCollection<T> implements Collection<List<T>>, Serializable { private static class UnmodifiableValueCollection<V> implements Collection<List<V>>, Serializable {
private static final long serialVersionUID = 5518377583904339588L; private static final long serialVersionUID = 5518377583904339588L;
private final Collection<List<T>> delegate; private final Collection<List<V>> delegate;
public UnmodifiableValueCollection(Collection<List<T>> delegate) { public UnmodifiableValueCollection(Collection<List<V>> delegate) {
this.delegate = delegate; this.delegate = delegate;
} }
@ -583,8 +583,8 @@ final class UnmodifiableMultiValueMap<K,V> implements MultiValueMap<K,V>, Serial
} }
@Override @Override
public Iterator<List<T>> iterator() { public Iterator<List<V>> iterator() {
Iterator<List<T>> iterator = this.delegate.iterator(); Iterator<List<V>> iterator = this.delegate.iterator();
return new Iterator<>() { return new Iterator<>() {
@Override @Override
public boolean hasNext() { public boolean hasNext() {
@ -592,29 +592,29 @@ final class UnmodifiableMultiValueMap<K,V> implements MultiValueMap<K,V>, Serial
} }
@Override @Override
public List<T> next() { public List<V> next() {
return Collections.unmodifiableList(iterator.next()); return Collections.unmodifiableList(iterator.next());
} }
}; };
} }
@Override @Override
public void forEach(Consumer<? super List<T>> action) { public void forEach(Consumer<? super List<V>> action) {
this.delegate.forEach(list -> action.accept(Collections.unmodifiableList(list))); this.delegate.forEach(list -> action.accept(Collections.unmodifiableList(list)));
} }
@Override @Override
public Spliterator<List<T>> spliterator() { public Spliterator<List<V>> spliterator() {
return new UnmodifiableValueSpliterator<>(this.delegate.spliterator()); return new UnmodifiableValueSpliterator<>(this.delegate.spliterator());
} }
@Override @Override
public Stream<List<T>> stream() { public Stream<List<V>> stream() {
return StreamSupport.stream(spliterator(), false); return StreamSupport.stream(spliterator(), false);
} }
@Override @Override
public Stream<List<T>> parallelStream() { public Stream<List<V>> parallelStream() {
return StreamSupport.stream(spliterator(), true); return StreamSupport.stream(spliterator(), true);
} }
@ -636,7 +636,7 @@ final class UnmodifiableMultiValueMap<K,V> implements MultiValueMap<K,V>, Serial
// unsupported // unsupported
@Override @Override
public boolean add(List<T> ts) { public boolean add(List<V> ts) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@ -646,7 +646,7 @@ final class UnmodifiableMultiValueMap<K,V> implements MultiValueMap<K,V>, Serial
} }
@Override @Override
public boolean addAll(Collection<? extends List<T>> c) { public boolean addAll(Collection<? extends List<V>> c) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@ -661,7 +661,7 @@ final class UnmodifiableMultiValueMap<K,V> implements MultiValueMap<K,V>, Serial
} }
@Override @Override
public boolean removeIf(Predicate<? super List<T>> filter) { public boolean removeIf(Predicate<? super List<V>> filter) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }