Changeset 16332 in josm for trunk

Timestamp:

2020-04-18T10:41:22+02:00 (5 years ago)

Author:

simon04

Message:

Java 8: use Stream

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• Test.java (modified) (2 diffs)
• tests/DuplicateNode.java (modified) (1 diff)
• tests/TagChecker.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/data/validation/Test.java

@@ -10 +10 @@
 import java.util.Optional;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import javax.swing.JCheckBox;
@@ -336 +337 @@
      */
     protected final Command deletePrimitivesIfNeeded(Collection<? extends OsmPrimitive> primitives) {
-        Collection<OsmPrimitive> primitivesToDelete = new ArrayList<>();
-        for (OsmPrimitive p : primitives) {
-            if (!p.isDeleted()) {
-                primitivesToDelete.add(p);
-            }
-        }
+        Collection<OsmPrimitive> primitivesToDelete = primitives.stream()
+                .filter(p -> !p.isDeleted())
+                .collect(Collectors.toList());
         if (!primitivesToDelete.isEmpty()) {
             return DeleteCommand.delete(primitivesToDelete);

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java

@@ -320 +320 @@
         if (nodes.size() >= 2) {
             // Use first existing node or first node if all nodes are new
-            Node target = null;
-            for (Node n: nodes) {
-                if (!n.isNew()) {
-                    target = n;
-                    break;
-                }
-            }
-            if (target == null) {
-                target = nodes.iterator().next();
-            }
+            Node target = nodes.stream()
+                    .filter(n -> !n.isNew())
+                    .findFirst()
+                    .orElseGet(() -> nodes.iterator().next());
 
             if (Command.checkOutlyingOrIncompleteOperation(nodes, Collections.singleton(target)) == Command.IS_OK)

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -217 +217 @@
             if (isKeyIgnored(key))
                 continue;
-            boolean allNumerical = true;
             Set<String> values = TaggingPresets.getPresetValues(key);
-            if (values.isEmpty())
-                allNumerical = false;
-            for (String val : values) {
-                if (!isNum(val)) {
-                    allNumerical = false;
-                    break;
-                }
-            }
+            boolean allNumerical = values != null && !values.isEmpty()
+                    && values.stream().allMatch(TagChecker::isNum);
             if (allNumerical) {
                 ignoreForLevenshtein.add(key);
@@ -394 +387 @@
     private static void initAdditionalPresetsValueData() {
         additionalPresetsValueData = new HashSet<>();
-        for (String a : AbstractPrimitive.getUninterestingKeys()) {
-            additionalPresetsValueData.add(a);
-        }
-        for (String a : Config.getPref().getList(ValidatorPrefHelper.PREFIX + ".knownkeys",
-                Arrays.asList("is_in", "int_ref", "fixme", "population"))) {
-            additionalPresetsValueData.add(a);
-        }
+        additionalPresetsValueData.addAll(AbstractPrimitive.getUninterestingKeys());
+        additionalPresetsValueData.addAll(Config.getPref().getList(
+                ValidatorPrefHelper.PREFIX + ".knownkeys",
+                Arrays.asList("is_in", "int_ref", "fixme", "population")));
     }
 
@@ -575 +565 @@
      */
     private static boolean isKeyIgnored(String key) {
-        if (ignoreDataEquals.contains(key)) {
-            return true;
-        }
-        for (String a : ignoreDataStartsWith) {
-            if (key.startsWith(a)) {
-                return true;
-            }
-        }
-        for (String a : ignoreDataEndsWith) {
-            if (key.endsWith(a)) {
-                return true;
-            }
-        }
-        return false;
+        return ignoreDataEquals.contains(key)
+                || ignoreDataStartsWith.stream().anyMatch(key::startsWith)
+                || ignoreDataEndsWith.stream().anyMatch(key::endsWith);
     }
 
@@ -605 +584 @@
             return true;
         if (!isTagInPresets(key, value)) {
-            for (Tag a : ignoreDataTag) {
-                if (key.equals(a.getKey()) && value.equals(a.getValue())) {
-                    return true;
-                }
-            }
+            return ignoreDataTag.stream()
+                    .anyMatch(a -> key.equals(a.getKey()) && value.equals(a.getValue()));
         }
         return false;
@@ -799 +775 @@
             fixedKey = isKeyInPresets(prettifiedKey) ? prettifiedKey : harmonizedKeys.get(prettifiedKey);
         }
-        if (fixedKey == null) {
-            for (Tag a : ignoreDataTag) {
-                if (a.getKey().equals(prettifiedKey)) {
-                    fixedKey = prettifiedKey;
-                    break;
-                }
-            }
+        if (fixedKey == null && ignoreDataTag.stream().anyMatch(a -> a.getKey().equals(prettifiedKey))) {
+            fixedKey = prettifiedKey;
         }
 
@@ -834 +805 @@
         if (harmonizedValue == null || harmonizedValue.isEmpty())
             return;
-        String fixedValue = null;
+        String fixedValue;
         List<Set<String>> sets = new ArrayList<>();
         Set<String> presetValues = getPresetValues(key);
@@ -842 +813 @@
         if (usedValues != null)
             sets.add(usedValues);
-        for (Set<String> possibleValues: sets) {
-            if (possibleValues.contains(harmonizedValue)) {
-                fixedValue = harmonizedValue;
-                break;
-            }
-        }
+        fixedValue = sets.stream().anyMatch(possibleValues -> possibleValues.contains(harmonizedValue))
+                ? harmonizedValue : null;
         if (fixedValue == null && !ignoreForLevenshtein.contains(key)) {
             int maxPresetValueLen = 0;