spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-10-07 23:49:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '7.0.x'

Browse Source
This commit is contained in:
Sam Brannen
2026-09-30 12:47:51 +02:00
parent 7cfbace755 1b4955e49f
commit 9b8850694d
2 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
+10 -5
View File
@@ -222,17 +222,22 @@ public class LinkedCaseInsensitiveMap<V extends @Nullable Object> implements Map
@Override
public @Nullable V computeIfAbsent(String key, Function<? super String, ? extends V> mappingFunction) {
String oldKey = this.caseInsensitiveKeys.putIfAbsent(convertKey(key), key);
String convertedKey = convertKey(key);
String oldKey = this.caseInsensitiveKeys.get(convertedKey);
if (oldKey != null) {
V oldKeyValue = this.targetMap.get(oldKey);
if (oldKeyValue != null) {
return oldKeyValue;
}
else {
key = oldKey;
}
return this.targetMap.computeIfAbsent(oldKey, mappingFunction);
}
return this.targetMap.computeIfAbsent(key, mappingFunction);
return this.targetMap.computeIfAbsent(key, k -> {
V value = mappingFunction.apply(k);
if (value != null) {
this.caseInsensitiveKeys.putIfAbsent(convertedKey, k);
}
return value;
});
}
@Override
spring-core/src/test/java/org/springframework/util/LinkedCaseInsensitiveMapTests.java
+46
View File
@@ -22,6 +22,7 @@ import java.util.Map;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
/**
* Tests for {@link LinkedCaseInsensitiveMap}.
@@ -106,6 +107,7 @@ class LinkedCaseInsensitiveMapTests {
assertThat(map.put("null", null)).isEqualTo("value");
assertThat(map.computeIfAbsent("NULL", s -> "value")).isEqualTo("value");
assertThat(map.get("null")).isEqualTo("value");
assertThat(map.keySet()).containsExactly("Key", "null");
}
@Test
@@ -115,6 +117,50 @@ class LinkedCaseInsensitiveMapTests {
assertThat(map.computeIfAbsent("Key", key -> "value3")).isEqualTo("value1");
}
@Test
void computeIfAbsentWithNullComputedValue() {
assertThat(map.computeIfAbsent("Key", key -> null)).isNull();
assertThat(map).isEmpty();
assertThat(map.containsKey("key")).isFalse();
}
@Test
void computeIfAbsentAfterNullComputedValueUsesGivenKey() {
assertThat(map.computeIfAbsent("Key", key -> null)).isNull();
assertThat(map.computeIfAbsent("KEY", key -> "value")).isEqualTo("value");
assertThat(map.keySet()).containsExactly("KEY");
}
@Test
void computeIfAbsentWithFailingMappingFunction() {
assertThatIllegalStateException().isThrownBy(() ->
map.computeIfAbsent("Key", key -> { throw new IllegalStateException(); }));
assertThat(map).isEmpty();
assertThat(map.containsKey("key")).isFalse();
}
@Test
void computeIfAbsentWithNullComputedValueForExistingNullValue() {
assertThat(map.put("Key", null)).isNull();
assertThat(map.computeIfAbsent("KEY", key -> null)).isNull();
assertThat(map).hasSize(1);
assertThat(map.containsKey("key")).isTrue();
assertThat(map.keySet()).containsExactly("Key");
}
@Test
void computeIfAbsentWithImmediatelyEvictedEntry() {
LinkedCaseInsensitiveMap<String> evictingMap = new LinkedCaseInsensitiveMap<>() {
@Override
protected boolean removeEldestEntry(Map.Entry<String, String> eldest) {
return true;
}
};
assertThat(evictingMap.computeIfAbsent("Key", key -> "value")).isEqualTo("value");
assertThat(evictingMap).isEmpty();
assertThat(evictingMap.containsKey("key")).isFalse();
}
@Test
void mapClone() {
assertThat(map.put("key", "value1")).isNull();