Skip to content

Polish LinkedCaseInsensitiveMap #22926

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

Closed
wants to merge 1 commit into from
Closed

Polish LinkedCaseInsensitiveMap #22926

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
36 changes: 16 additions & 20 deletions spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,32 +239,26 @@ public void clear() {

@Override
public Set<String> keySet() {
Set<String> keySet = this.keySet;
if (keySet == null) {
keySet = new KeySet(this.targetMap.keySet());
this.keySet = keySet;
if (this.keySet == null) {
this.keySet = new KeySet(this.targetMap.keySet());
}
return keySet;
return this.keySet;
}

@Override
public Collection<V> values() {
Collection<V> values = this.values;
if (values == null) {
values = new Values(this.targetMap.values());
this.values = values;
if (this.values == null) {
this.values = new Values(this.targetMap.values());
}
return values;
return this.values;
}

@Override
public Set<Entry<String, V>> entrySet() {
Set<Entry<String, V>> entrySet = this.entrySet;
if (entrySet == null) {
entrySet = new EntrySet(this.targetMap.entrySet());
this.entrySet = entrySet;
if (this.entrySet == null) {
this.entrySet = new EntrySet(this.targetMap.entrySet());
}
return entrySet;
return this.entrySet;
}

@Override
Expand Down Expand Up @@ -465,7 +459,7 @@ public void forEach(Consumer<? super Entry<String, V>> action) {
}


private class EntryIterator {
private abstract class EntryIterator<T> implements Iterator<T> {

private final Iterator<Entry<String, V>> delegate;

Expand All @@ -476,16 +470,18 @@ public EntryIterator() {
this.delegate = targetMap.entrySet().iterator();
}

public Entry<String, V> nextEntry() {
protected Entry<String, V> nextEntry() {
Entry<String, V> entry = this.delegate.next();
this.last = entry;
return entry;
}

@Override
public boolean hasNext() {
return this.delegate.hasNext();
}

@Override
public void remove() {
this.delegate.remove();
if (this.last != null) {
Expand All @@ -496,7 +492,7 @@ public void remove() {
}


private class KeySetIterator extends EntryIterator implements Iterator<String> {
private class KeySetIterator extends EntryIterator<String> {

@Override
public String next() {
Expand All @@ -505,7 +501,7 @@ public String next() {
}


private class ValuesIterator extends EntryIterator implements Iterator<V> {
private class ValuesIterator extends EntryIterator<V> {

@Override
public V next() {
Expand All @@ -514,7 +510,7 @@ public V next() {
}


private class EntrySetIterator extends EntryIterator implements Iterator<Entry<String, V>> {
private class EntrySetIterator extends EntryIterator<Entry<String, V>> {

@Override
public Entry<String, V> next() {
Expand Down