Changeset 15754 in josm for trunk/src/org

Timestamp:

2020-01-23T22:57:42+01:00 (5 years ago)

Author:

simon04

Message:

SourcePrefHelper: use Stream

File:

• trunk/src/org/openstreetmap/josm/data/preferences/sources/SourcePrefHelper.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/preferences/sources/SourcePrefHelper.java

@@ -8 +8 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -70 +71 @@
      */
     public List<SourceEntry> get() {
-
         List<Map<String, String>> src = Config.getPref().getListOfMaps(pref, null);
         if (src == null)
             return new ArrayList<>(getDefault());
-
-        List<SourceEntry> entries = new ArrayList<>();
-        for (Map<String, String> sourcePref : src) {
-            SourceEntry e = deserialize(new HashMap<>(sourcePref));
-            if (e != null) {
-                entries.add(e);
-            }
-        }
-        return entries;
+        return src.stream()
+                .map(sourcePref -> deserialize(new HashMap<>(sourcePref)))
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
     }
 
@@ -110 +105 @@
      */
     public final Set<String> getActiveUrls() {
-        Set<String> urls = new LinkedHashSet<>(); // retain order
-        for (SourceEntry e : get()) {
-            if (e.active) {
-                urls.add(e.url);
-            }
-        }
-        return urls;
+        return get().stream()
+                .filter(e -> e.active)
+                .map(e -> e.url)
+                .collect(Collectors.toCollection(LinkedHashSet::new)); // LinkedHashSet to retain order
     }
 }