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

Polish contribution
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
Deploy Docs / Dispatch docs deployment (push) Waiting to run Details 

See gh-35817
This commit is contained in:
Sam Brannen 2025-11-17 12:20:12 +01:00
parent ed75906834
commit 09a8bbc0c7
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
View File

@ -1021,6 +1021,7 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implemen
* Internal key-set implementation.
*/
private final class KeySet extends AbstractSet<K> {
@Override
public Iterator<K> iterator() {
return new KeyIterator();
@ -1079,6 +1080,7 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implemen
* Internal values collection implementation.
*/
private final class Values extends AbstractCollection<V> {
@Override
public Iterator<V> iterator() {
return new ValueIterator();

52
spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java
View File

@ -16,7 +16,6 @@
package org.springframework.util;
import java.util.AbstractMap;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@ -36,10 +35,11 @@ import org.springframework.util.ConcurrentReferenceHashMap.Reference;
import org.springframework.util.ConcurrentReferenceHashMap.Restructure;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.assertj.core.api.Assertions.assertThatNoException;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.entry;
/**
* Tests for {@link ConcurrentReferenceHashMap}.
@ -450,7 +450,7 @@ class ConcurrentReferenceHashMapTests {
assertThat(this.map.keySet()).isEqualTo(expected);
}
@Test
@Test // gh-35817
void keySetContains() {
this.map.put(123, "123");
this.map.put(456, null);
@ -458,7 +458,7 @@ class ConcurrentReferenceHashMapTests {
assertThat(this.map.keySet()).containsExactlyInAnyOrder(123, 456, null);
}
@Test
@Test // gh-35817
void keySetRemove() {
this.map.put(123, "123");
this.map.put(456, null);
@ -468,7 +468,7 @@ class ConcurrentReferenceHashMapTests {
assertThat(this.map.keySet().remove(123)).isFalse();
}
@Test
@Test // gh-35817
void keySetIterator() {
this.map.put(123, "123");
this.map.put(456, null);
@ -478,7 +478,7 @@ class ConcurrentReferenceHashMapTests {
assertThat(it).isExhausted();
}
@Test
@Test // gh-35817
void keySetIteratorRemove() {
this.map.put(123, "123");
this.map.put(456, null);
@ -493,7 +493,7 @@ class ConcurrentReferenceHashMapTests {
assertThat(this.map).containsOnlyKeys(123, null);
}
@Test
@Test // gh-35817
void keySetClear() {
this.map.put(123, "123");
this.map.put(456, null);
@ -503,14 +503,13 @@ class ConcurrentReferenceHashMapTests {
assertThat(this.map.keySet()).isEmpty();
}
@Test
@Test // gh-35817
void keySetAdd() {
assertThatThrownBy(() ->
this.map.keySet().add(12345)
).isInstanceOf(UnsupportedOperationException.class);
assertThatExceptionOfType(UnsupportedOperationException.class)
.isThrownBy(() -> this.map.keySet().add(12345));
}
@Test
@Test // gh-35817
void keySetStream() {
this.map.put(123, "123");
this.map.put(456, null);
@ -519,7 +518,7 @@ class ConcurrentReferenceHashMapTests {
assertThat(keys).containsExactlyInAnyOrder(123, 456, null);
}
@Test
@Test // gh-35817
void keySetSpliteratorCharacteristics() {
this.map.put(123, "123");
this.map.put(456, null);
@ -538,26 +537,25 @@ class ConcurrentReferenceHashMapTests {
assertThat(this.map.values()).containsExactlyInAnyOrder("123", null, "789");
}
@Test
@Test // gh-35817
void valuesCollectionAdd() {
assertThatThrownBy(() ->
this.map.values().add("12345")
).isInstanceOf(UnsupportedOperationException.class);
assertThatExceptionOfType(UnsupportedOperationException.class)
.isThrownBy(() -> this.map.values().add("12345"));
}
@Test
@Test // gh-35817
void valuesCollectionClear() {
Collection<String> values = this.map.values();
this.map.put(123, "123");
this.map.put(456, null);
this.map.put(null, "789");
assertThat(values).isNotEmpty();
assertThat(values).hasSize(3);
values.clear();
assertThat(values).isEmpty();
assertThat(this.map).isEmpty();
}
@Test
@Test // gh-35817
void valuesCollectionRemoval() {
Collection<String> values = this.map.values();
assertThat(values).isEmpty();
@ -567,14 +565,14 @@ class ConcurrentReferenceHashMapTests {
assertThat(values).containsExactlyInAnyOrder("123", null, "789");
values.remove(null);
assertThat(values).containsExactlyInAnyOrder("123", "789");
assertThat(map).containsOnly(new AbstractMap.SimpleEntry<>(123, "123"), new AbstractMap.SimpleEntry<>(null, "789"));
assertThat(map).containsOnly(entry(123, "123"), entry(null, "789"));
values.remove("123");
values.remove("789");
assertThat(values).isEmpty();
assertThat(map).isEmpty();
}
@Test
@Test // gh-35817
void valuesCollectionIterator() {
Iterator<String> iterator = this.map.values().iterator();
assertThat(iterator).isExhausted();
@ -585,7 +583,7 @@ class ConcurrentReferenceHashMapTests {
assertThat(iterator).toIterable().containsExactlyInAnyOrder("123", null, "789");
}
@Test
@Test // gh-35817
void valuesCollectionIteratorRemoval() {
this.map.put(123, "123");
this.map.put(456, null);
@ -602,16 +600,16 @@ class ConcurrentReferenceHashMapTests {
assertThat(this.map).containsOnlyKeys(123, 456);
}
@Test
@Test // gh-35817
void valuesCollectionStream() {
this.map.put(123, "123");
this.map.put(456, null);
this.map.put(null, "789");
List<String> values = this.map.values().stream().collect(Collectors.toList());
List<String> values = this.map.values().stream().toList();
assertThat(values).containsExactlyInAnyOrder("123", null, "789");
}
@Test
@Test // gh-35817
void valuesCollectionSpliteratorCharacteristics() {
this.map.put(123, "123");
this.map.put(456, null);
@ -698,7 +696,7 @@ class ConcurrentReferenceHashMapTests {
copy.forEach(entry -> assertThat(entrySet).doesNotContain(entry));
}
@Test
@Test // gh-35817
void entrySetSpliteratorCharacteristics() {
this.map.put(1, "1");
this.map.put(2, "2");