Changeset 16438 in josm for trunk/src/org/openstreetmap/josm/actions/corrector/ReverseWayTagCorrector.java

Timestamp:

2020-05-17T14:18:22+02:00 (4 years ago)

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

• trunk/src/org/openstreetmap/josm/actions/corrector/ReverseWayTagCorrector.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/corrector/ReverseWayTagCorrector.java

@@ -5 +5 @@
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -70 +71 @@
 
         static IStringSwitcher combined(IStringSwitcher... switchers) {
-            return key -> {
-                for (IStringSwitcher switcher : switchers) {
-                    final String newKey = switcher.apply(key);
-                    if (!key.equals(newKey)) {
-                        return newKey;
-                    }
-                }
-                return key;
-            };
+            return key -> Arrays.stream(switchers)
+                    .map(switcher -> switcher.apply(key))
+                    .filter(newKey -> !key.equals(newKey))
+                    .findFirst().orElse(key);
         }
     }
@@ -302 +298 @@
 
     private static boolean ignoreKeyForCorrection(String key) {
-        for (Pattern ignoredKey : IGNORED_KEYS) {
-            if (ignoredKey.matcher(key).matches()) {
-                return true;
-            }
-        }
-        return false;
+        return IGNORED_KEYS.stream()
+                .anyMatch(ignoredKey -> ignoredKey.matcher(key).matches());
     }
 }