Changeset 16438 in josm for trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java

Timestamp:

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

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

• trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java

@@ -234 +234 @@
         Set<RelationMember> matchCandidates = new HashSet<>(r2.getMembers());
         for (RelationMember rm : r1.getMembers()) {
-            RelationMember matched = null;
-            for (RelationMember cand : matchCandidates) {
-                if (!rm.getRole().equals(cand.getRole())) continue;
-                if (!isSemanticallyEqual(rm.getMember(), cand.getMember())) continue;
-                matched = cand;
-                break;
-            }
+            RelationMember matched = matchCandidates.stream()
+                    .filter(m -> rm.getRole().equals(m.getRole()))
+                    .filter(m -> isSemanticallyEqual(rm.getMember(), m.getMember()))
+                    .findFirst().orElse(null);
             if (matched == null) return false;
             matchCandidates.remove(matched);