Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reimplement SortedProperties#keys() a la Java 8.

This commit is contained in:
Gary Gregory 2021-09-28 10:44:45 -04:00
parent a18086f23b
commit c1f262302c
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/org/apache/commons/collections4/properties/SortedProperties.java
View File

@ -18,15 +18,14 @@
package org.apache.commons.collections4.properties;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Collections;
import java.util.AbstractMap.SimpleEntry;
import java.util.Enumeration;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.collections4.iterators.IteratorEnumeration;
@ -43,18 +42,17 @@ public class SortedProperties extends Properties {
private static final long serialVersionUID = 1L;
@Override
public synchronized Enumeration<Object> keys() {
return new IteratorEnumeration<>(keySet().stream().map(Object::toString).sorted().collect(Collectors.toList()).iterator());
public Set<Map.Entry<Object, Object>> entrySet() {
final Stream<SimpleEntry<Object, Object>> stream = sortedKeys().map(k -> new AbstractMap.SimpleEntry<>(k, getProperty(k)));
return stream.collect(Collectors.toCollection(LinkedHashSet::new));
}
@Override
public Set<Map.Entry<Object, Object>> entrySet() {
final Enumeration<Object> keys = keys();
final Set<Map.Entry<Object, Object>> entrySet = new LinkedHashSet<>();
while (keys.hasMoreElements()) {
final Object key = keys.nextElement();
entrySet.add(new AbstractMap.SimpleEntry<>(key, getProperty((String) key)));
}
return entrySet;
public synchronized Enumeration<Object> keys() {
return new IteratorEnumeration<>(sortedKeys().collect(Collectors.toList()).iterator());
}
private Stream<String> sortedKeys() {
return keySet().stream().map(Object::toString).sorted();
}
}