Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LinkedCaseInsensitiveMap provides reliable getOrDefault implementation

Browse Source 
Issue: SPR-13981
This commit is contained in:
Juergen Hoeller
2016-02-25 21:42:11 +01:00
parent b6dd8a9233
commit 7a32ce317c
2 changed files with 49 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -114,21 +114,35 @@ public class LinkedCaseInsensitiveMap<V> extends LinkedHashMap<String, V> {
@Override
public V get(Object key) {
if (key instanceof String) {
return super.get(this.caseInsensitiveKeys.get(convertKey((String) key)));
String caseInsensitiveKey = this.caseInsensitiveKeys.get(convertKey((String) key));
if (caseInsensitiveKey != null) {
return super.get(caseInsensitiveKey);
}
}
else {
return null;
return null;
}
// Overridden to avoid LinkedHashMap's own hash computation in its getOrDefault impl
@Override
public V getOrDefault(Object key, V defaultValue) {
if (key instanceof String) {
String caseInsensitiveKey = this.caseInsensitiveKeys.get(convertKey((String) key));
if (caseInsensitiveKey != null) {
return super.get(caseInsensitiveKey);
}
}
return defaultValue;
}
@Override
public V remove(Object key) {
if (key instanceof String ) {
return super.remove(this.caseInsensitiveKeys.remove(convertKey((String) key)));
}
else {
return null;
if (key instanceof String) {
String caseInsensitiveKey = this.caseInsensitiveKeys.remove(convertKey((String) key));
if (caseInsensitiveKey != null) {
return super.remove(caseInsensitiveKey);
}
}
return null;
}
@Override