Changeset 17585 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java

Timestamp:

2021-03-18T00:57:09+01:00 (4 years ago)

Author:

simon04

Message:

see #20613 - Use Tagged.visitKeys()

Avoids creating a temporary HashMap just for iteration purposes

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java (modified) (4 diffs)

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

@@ -18 +18 @@
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
 /**
@@ -224 +223 @@
     public List<TestError> validatePrimitive(OsmPrimitive p) {
         final List<TestError> errors = new ArrayList<>();
-        for (final String key : SubclassFilteredCollection.filter(p.keySet(),
-                Pattern.compile(":conditional(:.*)?$").asPredicate())) {
+        final Pattern pattern = Pattern.compile(":conditional(:.*)?$");
+        p.visitKeys((primitive, key, value) -> {
+            if (!pattern.matcher(key).find()) {
+                return;
+            }
             if (!isKeyValid(key)) {
                 errors.add(TestError.builder(this, Severity.WARNING, 3201)
@@ -231 +233 @@
                         .primitives(p)
                         .build());
-                continue;
-            }
-            final String value = p.get(key);
+                return;
+            }
             final String error = validateValue(key, value);
             if (error != null) {
@@ -241 +242 @@
                         .build());
             }
-        }
+        });
         return errors;
     }