Changeset 11175 in josm

Timestamp:

2016-10-27T00:32:44+02:00 (8 years ago)

Author:

simon04

Message:

APIDataSet: simplify implementation using streams, add test

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/APIDataSet.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/APIDataSet.java

@@ -12 +12 @@
 import java.util.Set;
 import java.util.Stack;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
@@ -57 +59 @@
     }
 
+    /**
+     * Initializes the API data set with the modified primitives, ignores unmodified primitives.
+     *
+     * @param primitives the primitives
+     */
     public final void init(Collection<OsmPrimitive> primitives) {
         toAdd.clear();
@@ -89 +96 @@
     /**
      * Replies true if one of the primitives to be updated or to be deleted
-     * participates in the conflict <code>conflict</code>
-     *
-     * @param conflict the conflict
-     * @return true if one of the primitives to be updated or to be deleted
-     * participates in the conflict <code>conflict</code>
-     */
-    public boolean participatesInConflict(Conflict<?> conflict) {
-        if (conflict == null) return false;
-        for (OsmPrimitive p: toUpdate) {
-            if (conflict.isParticipating(p)) return true;
-        }
-        for (OsmPrimitive p: toDelete) {
-            if (conflict.isParticipating(p)) return true;
-        }
-        return false;
-    }
-
-    /**
-     * Replies true if one of the primitives to be updated or to be deleted
      * participates in at least one conflict in <code>conflicts</code>
      *
@@ -116 +104 @@
     public boolean participatesInConflict(ConflictCollection conflicts) {
         if (conflicts == null || conflicts.isEmpty()) return false;
-        Set<PrimitiveId> idsParticipatingInConflicts = new HashSet<>();
-        for (OsmPrimitive p: conflicts.getMyConflictParties()) {
-            idsParticipatingInConflicts.add(p.getPrimitiveId());
-        }
-        for (OsmPrimitive p: conflicts.getTheirConflictParties()) {
-            idsParticipatingInConflicts.add(p.getPrimitiveId());
-        }
-        for (OsmPrimitive p: toUpdate) {
-            if (idsParticipatingInConflicts.contains(p.getPrimitiveId())) return true;
-        }
-        for (OsmPrimitive p: toDelete) {
-            if (idsParticipatingInConflicts.contains(p.getPrimitiveId())) return true;
-        }
-        return false;
+        Set<PrimitiveId> idsParticipatingInConflicts = conflicts.get().stream()
+                .flatMap(c -> Stream.of(c.getMy(), c.getTheir()))
+                .map(OsmPrimitive::getPrimitiveId)
+                .collect(Collectors.toSet());
+        return Stream.of(toUpdate, toDelete)
+                .flatMap(Collection::stream)
+                .map(OsmPrimitive::getPrimitiveId)
+                .anyMatch(idsParticipatingInConflicts::contains);
     }
 

trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -12 +13 @@
 import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
 import org.openstreetmap.josm.data.APIDataSet;
+import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -104 +106 @@
         assertEquals(1, toUpdate.size());
         assertEquals(r4, toUpdate.get(0));
+
+        final ConflictCollection cc4 = new ConflictCollection();
+        cc4.add(r4, r4);
+        assertTrue(apiDataSet.participatesInConflict(cc4));
+        final ConflictCollection cc1 = new ConflictCollection();
+        cc1.add(r1, r1);
+        assertFalse(apiDataSet.participatesInConflict(cc1));
     }